fix gtk2 useflag usage

9 files changed, 10 insertions, 145 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index 8567cb5b5d6c..e16bc95356af 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/twisted
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.26 2003/11/03 07:06:43 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.27 2003/12/06 14:55:57 liquidx Exp $
+
+  06 Dec 2003; Alastair Tse <liquidx@gentoo.org> twisted-1.0.6.ebuild,
+  twisted-1.0.7.ebuild, twisted-1.0.7_rc1.ebuild, twisted-1.1.0.ebuild:
+  cleanup and fix gtk2 useflags (#34558)
 
 *twisted-1.1.0 (27 Oct 2003)
   03 Nov 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.1.0.ebuild:
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 5e65e6bf6283..d1cb5d9a00c1 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,10 +1,4 @@
-MD5 1bf034abc9256308886eb123583497c6 twisted-1.1.0.ebuild 1006
-MD5 890a242f603b2a6bedfa33b97a3f3d76 twisted-1.0.6.ebuild 1219
-MD5 59755b7789d4ef04a04c902b9b01d3be twisted-1.0.7_rc1.ebuild 1262
-MD5 f60198402eea01b51809f31dc8e06bca ChangeLog 6836
+MD5 785ac548c10896d6b4a5a2de12150b7e ChangeLog 7021
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
-MD5 2489975a899a1d3dc7468c8e84613431 twisted-1.0.7.ebuild 1218
-MD5 7b72afa2517437dbde778c70b4e19af2 files/digest-twisted-1.0.6 67
-MD5 c4224a2ac969db93d73848f95579cbab files/digest-twisted-1.0.7 67
+MD5 88396863d0c8ee459ff4dae7a54b94fb twisted-1.1.0.ebuild 1007
 MD5 5c2c68c5857f1ad5b44c0672c5fd0671 files/digest-twisted-1.1.0 74
-MD5 784d7af8d65cba1fa9405b7072ada41b files/digest-twisted-1.0.7_rc1 70
diff --git a/dev-python/twisted/files/digest-twisted-1.0.6 b/dev-python/twisted/files/digest-twisted-1.0.6
deleted file mode 100644
index 5da11ce5dee7..000000000000
--- a/dev-python/twisted/files/digest-twisted-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff59478f4101aa05a923a318de8eb741 Twisted-1.0.6.tar.bz2 5191128
diff --git a/dev-python/twisted/files/digest-twisted-1.0.7 b/dev-python/twisted/files/digest-twisted-1.0.7
deleted file mode 100644
index f73225d6979c..000000000000
--- a/dev-python/twisted/files/digest-twisted-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f180e39731317aaf9b9b36497018ad9c Twisted-1.0.7.tar.bz2 5229998
diff --git a/dev-python/twisted/files/digest-twisted-1.0.7_rc1 b/dev-python/twisted/files/digest-twisted-1.0.7_rc1
deleted file mode 100644
index 6e2ce5f9d24d..000000000000
--- a/dev-python/twisted/files/digest-twisted-1.0.7_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75d0c8e2d206e39b40d06493d1b04624 Twisted-1.0.7rc1.tar.bz2 5202636
diff --git a/dev-python/twisted/twisted-1.0.6.ebuild b/dev-python/twisted/twisted-1.0.6.ebuild
deleted file mode 100644
index f87865cf70ff..000000000000
--- a/dev-python/twisted/twisted-1.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.0.6.ebuild,v 1.4 2003/09/06 23:32:29 msterret Exp $
-
-inherit distutils
-
-DESCRIPTION="collection of servers and clients, which can be used either by developers of new applications or directly. Documentation included."
-HOMEPAGE="http://www.twistedmatrix.com/"
-SRC_URI="http://twisted.sourceforge.net/Twisted-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 alpha sparc"
-IUSE="gtk2 doc"
-
-DEPEND=">=dev-lang/python-2.2*
-	>=dev-python/pycrypto-1.9_alpha4
-	gtk? ( =dev-python/pygtk-0.6* )
-	gtk2? ( >=dev-python/pygtk-1.99* )"
-
-S=${WORKDIR}/Twisted-${PV}
-
-src_install() {
-	distutils_src_install
-
-	# of course it's documentation!
-	doman doc/man/*.[0-9n]
-	rm -rf doc/man	# don't dupe the man pages
-
-	# next few lines will install docs: 9.4 megs!
-	if [ -n "`use doc`" ]; then
-		cd ${S}/doc
-		dodir /usr/share/doc/${PF}
-		cp -r . ${D}/usr/share/doc/${PF}
-	fi
-
-	# use gtk2 if they so wish
-	if [ -n "`use gtk2`" ]; then
-		sed -e 's/import manhole/import manhole2/' \
-			-e 's/manhole\.run()/manhole2.run()/' \
-			-i ${D}/usr/bin/manhole
-	fi
-}
diff --git a/dev-python/twisted/twisted-1.0.7.ebuild b/dev-python/twisted/twisted-1.0.7.ebuild
deleted file mode 100644
index 971e95e69584..000000000000
--- a/dev-python/twisted/twisted-1.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.0.7.ebuild,v 1.1 2003/09/13 13:58:03 lordvan Exp $
-
-inherit distutils
-
-DESCRIPTION="collection of servers and clients, which can be used either by developers of new applications or directly. Documentation included."
-HOMEPAGE="http://www.twistedmatrix.com/"
-SRC_URI="http://twisted.sourceforge.net/Twisted-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 alpha sparc"
-IUSE="gtk2 doc"
-
-DEPEND=">=dev-lang/python-2.2*
-	>=dev-python/pycrypto-1.9_alpha4
-	gtk? ( =dev-python/pygtk-0.6* )
-	gtk2? ( >=dev-python/pygtk-1.99* )"
-
-S=${WORKDIR}/Twisted-${PV}
-
-src_install() {
-	distutils_src_install
-
-	# of course it's documentation!
-	doman doc/man/*.[0-9n]
-	rm -rf doc/man	# don't dupe the man pages
-
-	# next few lines will install docs: 9.4 megs!
-	if [ -n "`use doc`" ]; then
-		cd ${S}/doc
-		dodir /usr/share/doc/${PF}
-		cp -r . ${D}/usr/share/doc/${PF}
-	fi
-
-	# use gtk2 if they so wish
-	if [ -n "`use gtk2`" ]; then
-		sed -e 's/import manhole/import manhole2/' \
-			-e 's/manhole\.run()/manhole2.run()/' \
-			-i ${D}/usr/bin/manhole
-	fi
-}
diff --git a/dev-python/twisted/twisted-1.0.7_rc1.ebuild b/dev-python/twisted/twisted-1.0.7_rc1.ebuild
deleted file mode 100644
index 6d3c0791e141..000000000000
--- a/dev-python/twisted/twisted-1.0.7_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.0.7_rc1.ebuild,v 1.3 2003/09/08 07:16:26 msterret Exp $
-
-IUSE="gtk2 doc"
-
-MY_PV="1.0.7rc1"
-S=${WORKDIR}/Twisted-${MY_PV}
-DESCRIPTION="Twisted is a collection of servers and clients, which can be used either by developers of new applications or directly. Documentation included."
-SRC_URI="http://twisted.sourceforge.net/Twisted-${MY_PV}.tar.bz2"
-HOMEPAGE="http://www.twistedmatrix.com/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-DEPEND=">=dev-lang/python-2.2*
-	>=dev-python/pycrypto-1.9_alpha4
-	gtk? ( =dev-python/pygtk-0.6* )
-	gtk2? ( >=dev-python/pygtk-1.99* )"
-KEYWORDS="~x86 ~alpha ~sparc"
-
-inherit distutils
-
-src_install() {
-	distutils_src_install
-
-	# of course it's documentation!
-	doman doc/man/*.[0-9n]
-	rm -rf doc/man	# don't dupe the man pages
-
-	# next few lines will install docs: 9.4 megs!
-	if [ -n "`use doc`" ]; then
-		cd ${S}/doc
-		dodir /usr/share/doc/${PF}
-		cp -r . ${D}/usr/share/doc/${PF}
-	fi
-
-	# use gtk2 if they so wish
-	if [ -n "`use gtk2`" ]; then
-		sed -e 's/import manhole/import manhole2/' \
-			-e 's/manhole\.run()/manhole2.run()/' \
-			-i ${D}/usr/bin/manhole
-	fi
-
-}
-
diff --git a/dev-python/twisted/twisted-1.1.0.ebuild b/dev-python/twisted/twisted-1.1.0.ebuild
index a33df591b5e7..d722ec738ea4 100644
--- a/dev-python/twisted/twisted-1.1.0.ebuild
+++ b/dev-python/twisted/twisted-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.1.0.ebuild,v 1.2 2003/11/03 07:06:43 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.1.0.ebuild,v 1.3 2003/12/06 14:55:57 liquidx Exp $
 
 inherit distutils
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="x86 alpha sparc"
 IUSE="gtk2 doc"
 
-DEPEND=">=dev-lang/python-2.2*
+DEPEND=">=dev-lang/python-2.2
 	>=dev-python/pycrypto-1.9_alpha4
-	gtk? ( =dev-python/pygtk-0.6* )
+	!gtk2? ( =dev-python/pygtk-0.6* )
 	gtk2? ( >=dev-python/pygtk-1.99* )
 	doc? ( =dev-python/twisted-docs-${PV} )"