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

(Portage version: 2.1.2_rc2)

4 files changed, 22 insertions, 133 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/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