Add revisions that depend on an old pygtk with USE=gtk and do not install the "im" script without that flag (bug #128688).

Package-Manager: portage-2.1.1_pre1-r2

10 files changed, 144 insertions, 16 deletions

diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index 6d83ba621af3..623a79e313e1 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/twisted-words
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.12 2006/05/26 18:47:48 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.13 2006/06/26 21:46:22 marienz Exp $
+
+*twisted-words-0.4.0-r1 (26 Jun 2006)
+*twisted-words-0.3.0-r1 (26 Jun 2006)
+*twisted-words-0.1.0-r2 (26 Jun 2006)
+
+  26 Jun 2006; Marien Zwart <marienz@gentoo.org>
+  +twisted-words-0.1.0-r2.ebuild, +twisted-words-0.3.0-r1.ebuild,
+  +twisted-words-0.4.0-r1.ebuild:
+  Add revisions that depend on an old pygtk with USE=gtk and do not install
+  the "im" script without that flag (bug #128688).
 
 *twisted-words-0.4.0 (26 May 2006)
 
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 17fb6fe68cee..2f520036faad 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,42 +1,63 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST TwistedWords-0.1.0.tar.bz2 117142
-DIST TwistedWords-0.3.0.tar.bz2 132780
+DIST TwistedWords-0.1.0.tar.bz2 117142 RMD160 a84d2e7bf41cd9dc156b0c9e8690e7c9b047dd66 SHA1 bb7ada20d06f32b575ca2d13e55ec36915388cee SHA256 583f158a1526c88d9a7121f826dcfaabfca56b507db6604ca6577a309232fa69
+DIST TwistedWords-0.3.0.tar.bz2 132780 RMD160 26ae859af854328d2018f97edd70123e65b4a3d5 SHA1 4877de5acdce885c911280e912ed2d7b6bb8ee07 SHA256 afc04db4759d9ff44fff86708b71c42ce8c4f6baadb005da6e580e5dffc1c03d
 DIST TwistedWords-0.4.0.tar.bz2 139966 RMD160 2e327ef7ecc9a3650684639c1a22cb481a3ea8e5 SHA1 50cfa564f0598c121ad043b334cef2d7f05e2004 SHA256 fba8135614723d9d8dbdbf9ab5b16ef2cc58a1c821eb456034fd357dbdb7fdb3
 EBUILD twisted-words-0.1.0-r1.ebuild 486 RMD160 dc3bcdf23ee8930199fbb8e7203c5378af49cceb SHA1 9bab196ff605c2dafee859e7c696673adb0ba135 SHA256 ea0e5895a749384332956f9f309ca93bbb51a49cc8a5c5ab41fed7306eeb30d9
 MD5 e20dcbbd92584cecdc1c88d77e21075d twisted-words-0.1.0-r1.ebuild 486
 RMD160 dc3bcdf23ee8930199fbb8e7203c5378af49cceb twisted-words-0.1.0-r1.ebuild 486
 SHA256 ea0e5895a749384332956f9f309ca93bbb51a49cc8a5c5ab41fed7306eeb30d9 twisted-words-0.1.0-r1.ebuild 486
+EBUILD twisted-words-0.1.0-r2.ebuild 702 RMD160 45f3cc8f3c77425b9de89c2016fc894d95c1b97b SHA1 ca80b1dce158dcee4b8db369052a5e9468176b41 SHA256 ad02bc112ec3fc405b2d14a8110a7b9b6218a7cd378b3c96479928f7d9ab0177
+MD5 03f3fd0a473c60b1cfcea87f6210eca4 twisted-words-0.1.0-r2.ebuild 702
+RMD160 45f3cc8f3c77425b9de89c2016fc894d95c1b97b twisted-words-0.1.0-r2.ebuild 702
+SHA256 ad02bc112ec3fc405b2d14a8110a7b9b6218a7cd378b3c96479928f7d9ab0177 twisted-words-0.1.0-r2.ebuild 702
+EBUILD twisted-words-0.3.0-r1.ebuild 685 RMD160 e57efee9f8918fc42a87de963f213c55d8037645 SHA1 1d5432e27e4d2d6b6d47ac636f070ace25322332 SHA256 92a22222759b49a0591c19f0b65e87af6a3f198b8b38aef08f4284309261112f
+MD5 df1bf36f8e4a961e671c119e0d1d4b3f twisted-words-0.3.0-r1.ebuild 685
+RMD160 e57efee9f8918fc42a87de963f213c55d8037645 twisted-words-0.3.0-r1.ebuild 685
+SHA256 92a22222759b49a0591c19f0b65e87af6a3f198b8b38aef08f4284309261112f twisted-words-0.3.0-r1.ebuild 685
 EBUILD twisted-words-0.3.0.ebuild 468 RMD160 2d5aecdacc4ce6b430fe7ec2281e38e4d8ce150c SHA1 3e0c72bd214e5238d1972e2e896af53c91f5dd82 SHA256 2f43f232919094ca83b44f1dd442b934ee7ed303e43855a481cf03f48e999cee
 MD5 fd4217d7f0b73ae2860fd0adb7ab316a twisted-words-0.3.0.ebuild 468
 RMD160 2d5aecdacc4ce6b430fe7ec2281e38e4d8ce150c twisted-words-0.3.0.ebuild 468
 SHA256 2f43f232919094ca83b44f1dd442b934ee7ed303e43855a481cf03f48e999cee twisted-words-0.3.0.ebuild 468
+EBUILD twisted-words-0.4.0-r1.ebuild 660 RMD160 6b0ee9bbc7289b51d21f8b80820e06106dde375c SHA1 5fdd301de56310390b082f20e58dcfda6a609068 SHA256 4892496380efc8e36a7a04b0913a33eada617dc367dd9348f35a04e4d27bef57
+MD5 bd6431285d8b1144e9fe13d7367ddbdc twisted-words-0.4.0-r1.ebuild 660
+RMD160 6b0ee9bbc7289b51d21f8b80820e06106dde375c twisted-words-0.4.0-r1.ebuild 660
+SHA256 4892496380efc8e36a7a04b0913a33eada617dc367dd9348f35a04e4d27bef57 twisted-words-0.4.0-r1.ebuild 660
 EBUILD twisted-words-0.4.0.ebuild 443 RMD160 4cd13ed441a182404aad6c379c20b02bab16532e SHA1 97b61b361e114c880caf548ea81e13efb372f9f0 SHA256 abef8bf3e81ec17ece0804a5739b85f4f3b45f708dbe5f5b5cfd243df276cd5a
 MD5 86e600a87bc81c4df74c0e50932a65f4 twisted-words-0.4.0.ebuild 443
 RMD160 4cd13ed441a182404aad6c379c20b02bab16532e twisted-words-0.4.0.ebuild 443
 SHA256 abef8bf3e81ec17ece0804a5739b85f4f3b45f708dbe5f5b5cfd243df276cd5a twisted-words-0.4.0.ebuild 443
-MISC ChangeLog 1715 RMD160 449a228d18f0d002715f548fa2ecfbc9b9982a31 SHA1 e7472da2344d0a1a4a5bed7948b47d947a9d9505 SHA256 4b49093c13ba34f4a92153ab55b33aeb9aa22c36ca360dd381cdbdb126283999
-MD5 9b6e1543e730e433b8d96b90bbdda189 ChangeLog 1715
-RMD160 449a228d18f0d002715f548fa2ecfbc9b9982a31 ChangeLog 1715
-SHA256 4b49093c13ba34f4a92153ab55b33aeb9aa22c36ca360dd381cdbdb126283999 ChangeLog 1715
+MISC ChangeLog 2107 RMD160 82adcf1a30bb9f699d3b08cf89b6170630852394 SHA1 57ac0f88be5cd4d1e0f484a31e0c28e05804a7a7 SHA256 7f9416a2c1b8513aaa5ef317b3cfb339817563e304e88f4efb2a6b29df5af89c
+MD5 96f6a6c94e6946367de8285d03df9cd8 ChangeLog 2107
+RMD160 82adcf1a30bb9f699d3b08cf89b6170630852394 ChangeLog 2107
+SHA256 7f9416a2c1b8513aaa5ef317b3cfb339817563e304e88f4efb2a6b29df5af89c ChangeLog 2107
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
 SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
-MD5 1799a75811b18557d3ad80550fffae15 files/digest-twisted-words-0.1.0-r1 71
-RMD160 01098d07ce00bcc177fe9df964ffef9921cb6f95 files/digest-twisted-words-0.1.0-r1 71
-SHA256 6cf380a39fc0d4cd159dcd585caf87c492709c60b05a128e85b594f94cfbda92 files/digest-twisted-words-0.1.0-r1 71
-MD5 99ab8bd010c1d5b6abfbf45700f017db files/digest-twisted-words-0.3.0 71
-RMD160 dd69b26c8d356560f594a4b390d19e861bd7dde6 files/digest-twisted-words-0.3.0 71
-SHA256 f46caeabc5be820631dc520b99bf76f29c127c768030f50b7acd6ddcec2a6d10 files/digest-twisted-words-0.3.0 71
+MD5 b7c341eb2e2502dcd93456d3d8ad221b files/digest-twisted-words-0.1.0-r1 259
+RMD160 d675041602ca0073526775a8d09befc108debb2a files/digest-twisted-words-0.1.0-r1 259
+SHA256 0ec5fd39da56f3e70e685b8090273ddb5e02b796b6d6b076c4bdc863a34d6c89 files/digest-twisted-words-0.1.0-r1 259
+MD5 b7c341eb2e2502dcd93456d3d8ad221b files/digest-twisted-words-0.1.0-r2 259
+RMD160 d675041602ca0073526775a8d09befc108debb2a files/digest-twisted-words-0.1.0-r2 259
+SHA256 0ec5fd39da56f3e70e685b8090273ddb5e02b796b6d6b076c4bdc863a34d6c89 files/digest-twisted-words-0.1.0-r2 259
+MD5 2e7c265a759f33a30f326a1650847152 files/digest-twisted-words-0.3.0 259
+RMD160 0bab28ddab5612691040a93bd6c0545cacede50d files/digest-twisted-words-0.3.0 259
+SHA256 d37dd318adaf12f01c1ab4006b7fc3527449f970d93ae6d16ea56088d357c64e files/digest-twisted-words-0.3.0 259
+MD5 2e7c265a759f33a30f326a1650847152 files/digest-twisted-words-0.3.0-r1 259
+RMD160 0bab28ddab5612691040a93bd6c0545cacede50d files/digest-twisted-words-0.3.0-r1 259
+SHA256 d37dd318adaf12f01c1ab4006b7fc3527449f970d93ae6d16ea56088d357c64e files/digest-twisted-words-0.3.0-r1 259
 MD5 27a7a5fef11e5f2f468e17aea69242c6 files/digest-twisted-words-0.4.0 259
 RMD160 954744f0e33750634c22d5e2c1f0a4a6b851726c files/digest-twisted-words-0.4.0 259
 SHA256 7d0e0129c961647932358d50486f45ac57a777c70a7590ff021f73e0cb1e1d25 files/digest-twisted-words-0.4.0 259
+MD5 27a7a5fef11e5f2f468e17aea69242c6 files/digest-twisted-words-0.4.0-r1 259
+RMD160 954744f0e33750634c22d5e2c1f0a4a6b851726c files/digest-twisted-words-0.4.0-r1 259
+SHA256 7d0e0129c961647932358d50486f45ac57a777c70a7590ff021f73e0cb1e1d25 files/digest-twisted-words-0.4.0-r1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEd01bW78445TWHXcRAolVAJ46hl+rc3NA6r1pInnmJogChVRYfACeIt2W
-ZbCdau8ELWdU8tG4bwQ9DZ0=
-=GVcZ
+iD8DBQFEoFW4UElL7eJpfEQRAk1TAJ9QewpIigc+V11eT1NVQ+gY85CDJwCgmTsc
+e4MCGG8E7AL/yzEUycOXZOA=
+=ZNSZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r1 b/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r1
index 26d3e6da2985..7065e692ff5b 100644
--- a/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r1
+++ b/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r1
@@ -1 +1,3 @@
 MD5 168ca07ab860324054c539bec1b0ef57 TwistedWords-0.1.0.tar.bz2 117142
+RMD160 a84d2e7bf41cd9dc156b0c9e8690e7c9b047dd66 TwistedWords-0.1.0.tar.bz2 117142
+SHA256 583f158a1526c88d9a7121f826dcfaabfca56b507db6604ca6577a309232fa69 TwistedWords-0.1.0.tar.bz2 117142
diff --git a/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r2 b/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r2
new file mode 100644
index 000000000000..7065e692ff5b
--- /dev/null
+++ b/dev-python/twisted-words/files/digest-twisted-words-0.1.0-r2
@@ -0,0 +1,3 @@
+MD5 168ca07ab860324054c539bec1b0ef57 TwistedWords-0.1.0.tar.bz2 117142
+RMD160 a84d2e7bf41cd9dc156b0c9e8690e7c9b047dd66 TwistedWords-0.1.0.tar.bz2 117142
+SHA256 583f158a1526c88d9a7121f826dcfaabfca56b507db6604ca6577a309232fa69 TwistedWords-0.1.0.tar.bz2 117142
diff --git a/dev-python/twisted-words/files/digest-twisted-words-0.3.0 b/dev-python/twisted-words/files/digest-twisted-words-0.3.0
index 9bcc4c5917f0..c48f2c0029c0 100644
--- a/dev-python/twisted-words/files/digest-twisted-words-0.3.0
+++ b/dev-python/twisted-words/files/digest-twisted-words-0.3.0
@@ -1 +1,3 @@
 MD5 8fdb18c85bde467baddc1c7f3febb82e TwistedWords-0.3.0.tar.bz2 132780
+RMD160 26ae859af854328d2018f97edd70123e65b4a3d5 TwistedWords-0.3.0.tar.bz2 132780
+SHA256 afc04db4759d9ff44fff86708b71c42ce8c4f6baadb005da6e580e5dffc1c03d TwistedWords-0.3.0.tar.bz2 132780
diff --git a/dev-python/twisted-words/files/digest-twisted-words-0.3.0-r1 b/dev-python/twisted-words/files/digest-twisted-words-0.3.0-r1
new file mode 100644
index 000000000000..c48f2c0029c0
--- /dev/null
+++ b/dev-python/twisted-words/files/digest-twisted-words-0.3.0-r1
@@ -0,0 +1,3 @@
+MD5 8fdb18c85bde467baddc1c7f3febb82e TwistedWords-0.3.0.tar.bz2 132780
+RMD160 26ae859af854328d2018f97edd70123e65b4a3d5 TwistedWords-0.3.0.tar.bz2 132780
+SHA256 afc04db4759d9ff44fff86708b71c42ce8c4f6baadb005da6e580e5dffc1c03d TwistedWords-0.3.0.tar.bz2 132780
diff --git a/dev-python/twisted-words/files/digest-twisted-words-0.4.0-r1 b/dev-python/twisted-words/files/digest-twisted-words-0.4.0-r1
new file mode 100644
index 000000000000..a365ab2d22df
--- /dev/null
+++ b/dev-python/twisted-words/files/digest-twisted-words-0.4.0-r1
@@ -0,0 +1,3 @@
+MD5 37d34da233aefe4a7a41b97bc9222b6a TwistedWords-0.4.0.tar.bz2 139966
+RMD160 2e327ef7ecc9a3650684639c1a22cb481a3ea8e5 TwistedWords-0.4.0.tar.bz2 139966
+SHA256 fba8135614723d9d8dbdbf9ab5b16ef2cc58a1c821eb456034fd357dbdb7fdb3 TwistedWords-0.4.0.tar.bz2 139966
diff --git a/dev-python/twisted-words/twisted-words-0.1.0-r2.ebuild b/dev-python/twisted-words/twisted-words-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..227c333774ac
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-0.1.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.1.0-r2.ebuild,v 1.1 2006/06/26 21:46:22 marienz Exp $
+
+MY_PACKAGE=Words
+
+inherit twisted
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations."
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-python/twisted-2
+	<dev-python/twisted-2.4
+	dev-python/twisted-web
+	dev-python/twisted-xish
+	gtk? ( <dev-python/pygtk-2 )"
+
+IUSE="gtk"
+
+
+src_install() {
+	twisted_src_install
+
+	if ! use gtk; then
+		# Remove the "im" script if we do not depend on the required pygtk.
+		rm -rf "${D}"/usr/{bin,share/man}
+	fi
+}
diff --git a/dev-python/twisted-words/twisted-words-0.3.0-r1.ebuild b/dev-python/twisted-words/twisted-words-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..fc40fd5f466e
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-0.3.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.3.0-r1.ebuild,v 1.1 2006/06/26 21:46:22 marienz Exp $
+
+MY_PACKAGE=Words
+
+inherit twisted
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations."
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-python/twisted-2.1
+	<dev-python/twisted-2.4
+	dev-python/twisted-web
+	gtk? ( <dev-python/pygtk-2 )"
+
+IUSE="gtk"
+
+
+src_install() {
+	twisted_src_install
+
+	if ! use gtk; then
+		# Remove the "im" script if we do not depend on the required pygtk.
+		rm -rf "${D}"/usr/{bin,share/man}
+	fi
+}
diff --git a/dev-python/twisted-words/twisted-words-0.4.0-r1.ebuild b/dev-python/twisted-words/twisted-words-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..4e84bbb8b888
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-0.4.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.4.0-r1.ebuild,v 1.1 2006/06/26 21:46:22 marienz Exp $
+
+MY_PACKAGE=Words
+
+inherit twisted
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations."
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-python/twisted-2.4
+	dev-python/twisted-web
+	gtk? ( <dev-python/pygtk-2 )"
+
+IUSE="gtk"
+
+
+src_install() {
+	twisted_src_install
+
+	if ! use gtk; then
+		# Remove the "im" script if we do not depend on the required pygtk.
+		rm -rf "${D}"/usr/{bin,share/man}
+	fi
+}