drop cdrom, esd, gnome, gtk, ncurses useflags for gnome 1.x removal

Package-Manager: portage-2.1.2_rc2

5 files changed, 38 insertions, 159 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index cbbf9abfe996..9b7b196f9996 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.61 2006/11/13 14:55:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.62 2006/11/19 02:10:35 compnerd Exp $
+
+  19 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> bitchx-1.1-r1.ebuild,
+  bitchx-1.1-r2.ebuild, bitchx-1.1-r3.ebuild:
+  Drop gnome, gtk, esd, ncurses, cdrom useflags for GNOME 1.x removal
 
   13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> bitchx-1.1-r1.ebuild,
   bitchx-1.1-r2.ebuild, bitchx-1.1-r3.ebuild:
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index 4f037a3e6dea..0e6b8c463eda 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1/bitchx-1.1-build.patch 1537 RMD160 f8e6f64ced74de43b23a331e55540766c42bf719 SHA1 de72e19478bbb7a77f96c19ee28693f4825a3095 SHA256 7cbbb5af0a67782eb2753ab5dca0747f591771dc0f0f117d3803a8eeb741caa9
 MD5 7c0e9fc55192343d973dc663ed8a081b files/1.1/bitchx-1.1-build.patch 1537
 RMD160 f8e6f64ced74de43b23a331e55540766c42bf719 files/1.1/bitchx-1.1-build.patch 1537
@@ -38,22 +35,22 @@ MD5 cec20e4fc802c01abdd729d89447b3c7 files/fPIC.patch 16020
 RMD160 f5d74dbce125e6a453d0cfed0ba0de380e23ee58 files/fPIC.patch 16020
 SHA256 cf57831c0f75d00b97582442e664cf77602ce9e0ef057685bea2084012da2163 files/fPIC.patch 16020
 DIST ircii-pana-1.1-final.tar.gz 2532476 RMD160 4105de2587964146e2391a26a8a16e3d0059a93f SHA1 b25635b62c7ff905b6492a4aaa88c43b5aa164f8 SHA256 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
-EBUILD bitchx-1.1-r1.ebuild 3401 RMD160 4af25c84690dae68a0ada066206168e6c0514afb SHA1 dd7a903dde5eba24cb6fe9c869f255a9b726d412 SHA256 390357cf08cec0cfa0e9dd4422909dd3410871106214ca494b10f1a060d7a21d
-MD5 bf8a75fdca7aee2fd471296f33abc5ea bitchx-1.1-r1.ebuild 3401
-RMD160 4af25c84690dae68a0ada066206168e6c0514afb bitchx-1.1-r1.ebuild 3401
-SHA256 390357cf08cec0cfa0e9dd4422909dd3410871106214ca494b10f1a060d7a21d bitchx-1.1-r1.ebuild 3401
-EBUILD bitchx-1.1-r2.ebuild 3589 RMD160 b64c3eedcfdfe8fcd512b73f62b29e4f3e4ebbc6 SHA1 83bae91fff978df7f5f982b0921e60fce7ae8037 SHA256 11b80225d76cda9c9e6a1e50168ff3b5747a3cee1e043479a265c8ceeb4dbc3b
-MD5 57fd9b040822a0e5666804a5eb84e6d1 bitchx-1.1-r2.ebuild 3589
-RMD160 b64c3eedcfdfe8fcd512b73f62b29e4f3e4ebbc6 bitchx-1.1-r2.ebuild 3589
-SHA256 11b80225d76cda9c9e6a1e50168ff3b5747a3cee1e043479a265c8ceeb4dbc3b bitchx-1.1-r2.ebuild 3589
-EBUILD bitchx-1.1-r3.ebuild 3110 RMD160 8879088ff052b4f81b38e53c7e33a504ab9d4bd2 SHA1 8a2ad17e4489c4d18976d991a2b4e8c949e38ea3 SHA256 0df6510da91380240d06549f361b1b9f900153d32ba134005b1d857ec8ccd649
-MD5 dcaa49ac0584a7f18b8c1bc6186fcabe bitchx-1.1-r3.ebuild 3110
-RMD160 8879088ff052b4f81b38e53c7e33a504ab9d4bd2 bitchx-1.1-r3.ebuild 3110
-SHA256 0df6510da91380240d06549f361b1b9f900153d32ba134005b1d857ec8ccd649 bitchx-1.1-r3.ebuild 3110
-MISC ChangeLog 9658 RMD160 016bdc3da5df018a00d1ccca8dfd080e9f203bae SHA1 42ac64a7d5282c311a0bee6df6fc559b13ba3128 SHA256 d9da448b7c0d2cc44fb48bc549ba584e50309806207a5198124f48c760607b5c
-MD5 f759987885337bbbc542484ee7017037 ChangeLog 9658
-RMD160 016bdc3da5df018a00d1ccca8dfd080e9f203bae ChangeLog 9658
-SHA256 d9da448b7c0d2cc44fb48bc549ba584e50309806207a5198124f48c760607b5c ChangeLog 9658
+EBUILD bitchx-1.1-r1.ebuild 2533 RMD160 98283715f446ef6e52a649cd0f71e5a959d5e5ac SHA1 cf735bdb3e7fa819afb1a1ea2633153764d9abd9 SHA256 b50835ef541cba5af29835453eef3cab19c313d022209bfe0129a36b647f7f7c
+MD5 c17e025983289c0d338f00acf46ec5e9 bitchx-1.1-r1.ebuild 2533
+RMD160 98283715f446ef6e52a649cd0f71e5a959d5e5ac bitchx-1.1-r1.ebuild 2533
+SHA256 b50835ef541cba5af29835453eef3cab19c313d022209bfe0129a36b647f7f7c bitchx-1.1-r1.ebuild 2533
+EBUILD bitchx-1.1-r2.ebuild 2470 RMD160 01b8d9f7298e6cab361f2135939791125613ff11 SHA1 bb59b649157b0fbfbf148b8abe6a369439e87998 SHA256 a0c1359f2b6d7c5110c86a397ff7c7afd9a5360bd898f8cdc08e588d72666e64
+MD5 808ec893b28bcc0dc25651db31adbd90 bitchx-1.1-r2.ebuild 2470
+RMD160 01b8d9f7298e6cab361f2135939791125613ff11 bitchx-1.1-r2.ebuild 2470
+SHA256 a0c1359f2b6d7c5110c86a397ff7c7afd9a5360bd898f8cdc08e588d72666e64 bitchx-1.1-r2.ebuild 2470
+EBUILD bitchx-1.1-r3.ebuild 2220 RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2 SHA1 707e559d7a7330ed975c43af6843597a6a436953 SHA256 03d99f9bf7126cfccce77ac9fcb432fd3ef8d03ae783ca57cda89193f7c51a2a
+MD5 037a214ce9aa81823cd7b683a608f711 bitchx-1.1-r3.ebuild 2220
+RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2 bitchx-1.1-r3.ebuild 2220
+SHA256 03d99f9bf7126cfccce77ac9fcb432fd3ef8d03ae783ca57cda89193f7c51a2a bitchx-1.1-r3.ebuild 2220
+MISC ChangeLog 9852 RMD160 f18a06bb14d7fb1ba348345d5be4c1104dd55a20 SHA1 e3338f9d68870233394ec70a71e46225494a0646 SHA256 88ce83be6dbc215f99a8ad035edc72301d3e9122b860643e337e9865aefb9e8c
+MD5 a7c3412867d4124dd75a712b54615ab2 ChangeLog 9852
+RMD160 f18a06bb14d7fb1ba348345d5be4c1104dd55a20 ChangeLog 9852
+SHA256 88ce83be6dbc215f99a8ad035edc72301d3e9122b860643e337e9865aefb9e8c ChangeLog 9852
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -67,10 +64,3 @@ SHA256 b887ce873dac0187a49aed011e373bd906a47eb07bb57cf9ab8c19679dd6b5b9 files/di
 MD5 1873b03a5006711d41c6a2093e662bb4 files/digest-bitchx-1.1-r3 265
 RMD160 3f0d1b70efd0af5e4da21cac283df25bcb5fbd24 files/digest-bitchx-1.1-r3 265
 SHA256 b887ce873dac0187a49aed011e373bd906a47eb07bb57cf9ab8c19679dd6b5b9 files/digest-bitchx-1.1-r3 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFWIdZAiZjviIA2XgRAnq9AJ9igoWGkA0jq3WsXh2n6anubYe4jQCeK7r5
-FUPFQHNI9GdO328wiUSKhG4=
-=FS+o
------END PGP SIGNATURE-----
diff --git a/net-irc/bitchx/bitchx-1.1-r1.ebuild b/net-irc/bitchx/bitchx-1.1-r1.ebuild
index d1a0c340867a..e604b5a4be27 100644
--- a/net-irc/bitchx/bitchx-1.1-r1.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.8 2006/11/13 14:55:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.9 2006/11/19 02:10:35 compnerd Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,22 +13,10 @@ SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
-IUSE="cdrom cjk esd gnome gtk ipv6 ncurses ssl"
+IUSE="cjk ipv6 ssl"
 
 DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	!arm? (
-		esd? (
-			>=media-sound/esound-0.2.5
-			>=media-libs/audiofile-0.1.5
-		)
-		gtk? (
-			=x11-libs/gtk+-1.2*
-			>=media-libs/imlib-1.9.10-r1
-		)
-		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	)"
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
@@ -48,7 +36,7 @@ src_compile() {
 	[ "${ARCH}" == "amd64" ] && append-flags "-fPIC"
 	replace-flags -O[3-9] -O2
 
-	local myconf
+	local myconf="--disable-sound --without-gtk --disable-cdrom"
 
 	if [ "${DEBUG}" ]
 	then
@@ -56,15 +44,6 @@ src_compile() {
 		myconf="${myconf} --enable-debug"
 	fi
 
-	use esd && use gtk \
-		&& myconf="${myconf} --enable-sound" \
-		|| myconf="${myconf} --disable-sound"
-
-	use gtk && use gnome\
-		&& myconf="${myconf} --with-gtk" \
-		|| myconf="${myconf} --without-gtk"
-
-
 	# lamer@gentoo.org BROKEN, will not work with our socks
 	# implementations, is looking for a SOCKSConnect function that our
 	# dante packages don't have :-(
@@ -76,17 +55,10 @@ src_compile() {
 	sed -e "s/#undef LATIN1/#define LATIN1 ON/;" \
 		${S}/include/config.h.orig > \
 		${S}/include/config.h
-	#ugly workaround
-	use gtk && use gnome && ( \
-		einfo "gtkBitchX will be built, if you want BitchX please issue"
-		einfo "USE="-gtk" emerge bitchx"
-		epause 10
-		) && append-flags -I/usr/include/gnome-1.0
 
 	econf \
 		CFLAGS="${CFLAGS}" \
 		--with-plugins \
-		`use_enable cdrom` \
 		`use_with ssl` \
 		`use_enable ipv6` \
 		${myconf} || die
@@ -100,13 +72,7 @@ src_install () {
 	rm ${D}/usr/share/man/man1/BitchX*
 	doman doc/BitchX.1
 
-	use gnome && use gtk && ( \
-		exeinto /usr/bin
-		#newexe ${S}/source/BitchX BitchX-1.0c19
-		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
-		einfo "Installed gtkBitchX"
-	) || dosym BitchX-1.1-final /usr/bin/BitchX
-
+	dosym BitchX-1.1-final /usr/bin/BitchX
 	fperms a-x /usr/lib/bx/plugins/BitchX.hints
 
 	cd ${S}
@@ -123,8 +89,6 @@ src_install () {
 	docinto plugins
 	dodoc plugins
 	cd ../dll
-	insinto /usr/lib/bx/wav
-	doins wavplay/*.wav
 	dodoc nap/README.nap
 	newdoc acro/README README.acro
 	newdoc arcfour/README README.arcfour
diff --git a/net-irc/bitchx/bitchx-1.1-r2.ebuild b/net-irc/bitchx/bitchx-1.1-r2.ebuild
index 8d29f6d8e5de..359b71891362 100644
--- a/net-irc/bitchx/bitchx-1.1-r2.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.7 2006/11/13 14:55:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.8 2006/11/19 02:10:35 compnerd Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,24 +13,10 @@ SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64"
-IUSE="cdrom cjk esd gnome gtk ipv6 ncurses ssl"
+IUSE="cjk ipv6 ssl"
 
 DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	!arm? (
-		esd? (
-			>=media-sound/esound-0.2.5
-			>=media-libs/audiofile-0.1.5
-		)
-		!amd64? (
-			gtk? (
-				=x11-libs/gtk+-1.2*
-				>=media-libs/imlib-1.9.10-r1
-			)
-		)
-		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	)"
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
@@ -48,7 +34,7 @@ src_compile() {
 	# BitchX needs to be merged with -fPIC on alpha/hppa boxes #10932
 	replace-flags -O[3-9] -O2
 
-	local myconf
+	local myconf="--disable-cdrom --disable-sound --without-gtk"
 
 	if [ "${DEBUG}" ]
 	then
@@ -56,15 +42,6 @@ src_compile() {
 		myconf="${myconf} --enable-debug"
 	fi
 
-	use !amd64 && use esd && use gtk \
-		&& myconf="${myconf} --enable-sound" \
-		|| myconf="${myconf} --disable-sound"
-
-	use !amd64 && use gtk && use gnome\
-		&& myconf="${myconf} --with-gtk" \
-		|| myconf="${myconf} --without-gtk"
-
-
 	# lamer@gentoo.org BROKEN, will not work with our socks
 	# implementations, is looking for a SOCKSConnect function that our
 	# dante packages don't have :-(
@@ -76,22 +53,11 @@ src_compile() {
 	sed -e "s/#undef LATIN1/#define LATIN1 ON/;" \
 		${S}/include/config.h.orig > \
 		${S}/include/config.h
-	#ugly workaround
-	use !amd64 && use gtk && use gnome && ( \
-		einfo "gtkBitchX will be built, if you want BitchX please issue"
-		einfo "USE="-gtk" emerge bitchx"
-		epause 10
-		) && append-flags -I/usr/include/gnome-1.0
-	#even uglier hack
-	use amd64 && use gtk && use gnome && ( \
-		ewarn "gtkBitchX is broken on amd64, so we're building it"
-		ewarn "with USE=-gtk. See bug #61133"
-		epause 10 )
+
 	econf \
 		CFLAGS="${CFLAGS}" \
 		SHLIB_CFLAGS="${CFLAGS} -fPIC" \
 		--with-plugins \
-		`use_enable cdrom` \
 		`use_with ssl` \
 		`use_enable ipv6` \
 		${myconf} || die
@@ -106,13 +72,7 @@ src_install () {
 	rm ${D}/usr/share/man/man1/BitchX*
 	doman doc/BitchX.1
 
-	use !amd64 && use gnome && use gtk && ( \
-		exeinto /usr/bin
-		#newexe ${S}/source/BitchX BitchX-1.0c19
-		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
-		einfo "Installed gtkBitchX"
-	) || dosym BitchX-1.1-final /usr/bin/BitchX
-
+	dosym BitchX-1.1-final /usr/bin/BitchX
 	fperms a-x /usr/lib/bx/plugins/BitchX.hints
 
 	cd ${S}
@@ -129,8 +89,6 @@ src_install () {
 	docinto plugins
 	dodoc plugins
 	cd ../dll
-	insinto /usr/lib/bx/wav
-	doins wavplay/*.wav
 	dodoc nap/README.nap
 	newdoc acro/README README.acro
 	newdoc arcfour/README README.arcfour
diff --git a/net-irc/bitchx/bitchx-1.1-r3.ebuild b/net-irc/bitchx/bitchx-1.1-r3.ebuild
index 446b91639313..37317e3e4a0b 100644
--- a/net-irc/bitchx/bitchx-1.1-r3.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r3.ebuild,v 1.10 2006/11/13 14:55:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r3.ebuild,v 1.11 2006/11/19 02:10:35 compnerd Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,20 +13,10 @@ SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc sh sparc x86"
-IUSE="cdrom cjk esd gnome gtk ipv6 ncurses ssl"
+IUSE="cjk ipv6 ssl"
 
 DEPEND=">=sys-libs/ncurses-5.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	esd? (
-		>=media-sound/esound-0.2.5
-		>=media-libs/audiofile-0.1.5
-	)
-	gtk? (
-		=x11-libs/gtk+-1.2*
-		>=media-libs/imlib-1.9.10-r1
-	)
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
@@ -50,28 +40,8 @@ src_compile() {
 	replace-flags -O[3-9] -O2
 	append-flags -fno-strict-aliasing
 
-	# bug #147165
-	append-flags -I/usr/include/gnome-1.0
-
-	local myconf
-
-	use esd && use gtk \
-		&& myconf="${myconf} --enable-sound" \
-		|| myconf="${myconf} --disable-sound"
-	if use gtk && use gnome ; then
-		if use amd64 ; then
-			ewarn "gtkBitchX is broken on amd64, so we're building it"
-			ewarn "with USE=-gtk.  See http://bugs.gentoo.org/61133"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "gtkBitchX will be built, if you want BitchX please run:"
-			einfo "USE=-gtk emerge bitchx"
-			myconf="${myconf} --with-gtk"
-		fi
-		epause 10
-	else
-		myconf="${myconf} --without-gtk"
-	fi
+	# Disable CDROM or else it will take over your CDROM drive
+	local myconf="--disable-cdrom --disable-sound --without-gtk"
 
 	# lamer@gentoo.org BROKEN, will not work with our socks
 	# implementations, is looking for a SOCKSConnect function that our
@@ -82,7 +52,6 @@ src_compile() {
 
 	econf \
 		--with-plugins \
-		$(use_enable cdrom) \
 		$(use_with ssl) \
 		$(use_enable ipv6) \
 		${myconf} || die
@@ -94,11 +63,7 @@ src_compile() {
 src_install () {
 	einstall || die
 	dobin contrib/vh1 || die
-	if ! use amd64 && use gnome && use gtk ; then
-		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
-	else
-		dosym BitchX-1.1-final /usr/bin/BitchX
-	fi
+	dosym BitchX-1.1-final /usr/bin/BitchX
 
 	cd "${S}"
 	dodoc bugs Changelog README* IPv6-support
@@ -110,8 +75,6 @@ src_install () {
 	dohtml -r *
 
 	cd "${S}"/dll
-	insinto /usr/lib/bx/wav
-	doins wavplay/*.wav || die
 	docinto plugins
 	dodoc nap/README.nap
 	newdoc acro/README README.acro