Kill gtk2 USE flag for bug 106560

(Portage version: 2.0.51.22-r2)

6 files changed, 53 insertions, 64 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index bcb422ca2c28..3fd4c9769a5a 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.84 2005/09/16 23:15:03 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.85 2005/09/19 20:11:41 vanquirius Exp $
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild,
+  nessus-core-2.2.5.ebuild, nessus-core-2.3.1.ebuild:
+  Kill gtk2 USE flag for bug 106560.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index 7d1d05badd63..41d1cc4081f9 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 17268f3b0a1905b645745da78bec4baa nessus-core-2.2.5.ebuild 1470
-MD5 9967714d2877109d77112402f9d81b3e nessus-core-2.2.4.ebuild 1355
-MD5 4683c4cbf53ab2ef063953cd046afbf6 nessus-core-2.3.1.ebuild 1435
-MD5 f08fce2b734c2a3778ceaaafd14ca381 nessus-core-2.2.4-r1.ebuild 1419
-MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
+MD5 0cd4af8bcbd38bb72adcb63244bb2df4 nessus-core-2.2.4.ebuild 1317
+MD5 624aa28dfd8c8dc1bae6718cc17ae885 nessus-core-2.3.1.ebuild 1395
+MD5 47dfa924070725376232f99a8e4f2a9c nessus-core-2.2.5.ebuild 1434
+MD5 0d61775b4b45cf473fb20632406948a7 nessus-core-2.2.4-r1.ebuild 1383
 MD5 5c36a56f0d2ab430af3796198bff4b38 ChangeLog 13237
-MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
+MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
 MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4-r1 69
-MD5 744bc3edda6ddfce4a2f0bbc7e5d0076 files/digest-nessus-core-2.3.1 70
 MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4 69
 MD5 5bb019dc7ddb86a68f016c19c614ab1e files/digest-nessus-core-2.2.5 69
-MD5 13b7d55481f8360bcc13bb529e79c6cf files/nessus-core-2.3.1-gcc4.diff 325
-MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
+MD5 744bc3edda6ddfce4a2f0bbc7e5d0076 files/digest-nessus-core-2.3.1 70
 MD5 61f74be9ca310ac7e5fe540db2c61beb files/nessusd-r6 644
 MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK1IrLLFUmVNQ7rkRAjZMAKCr/lkpNSXghhJ88iNhP1Hf74AA5QCfeFvA
-VPVncch3+cPlm5UOXoE1FZA=
-=A17E
------END PGP SIGNATURE-----
+MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
+MD5 13b7d55481f8360bcc13bb529e79c6cf files/nessus-core-2.3.1-gcc4.diff 325
+MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
index 34d2b49e765d..84b71b47ee4a 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.12 2005/08/14 10:10:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.13 2005/09/19 20:11:41 vanquirius Exp $
 
 inherit toolchain-funcs eutils gnuconfig
 
@@ -11,17 +11,16 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="X tcpd gtk2 debug prelude"
+IUSE="X tcpd debug prelude"
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	X? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +29,7 @@ src_unpack() {
 
 src_compile() {
 
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf `use_enable tcpd tcpwrappers` \
 		`use_enable debug` \
 		`use_enable X gtk` \
@@ -40,16 +39,16 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		install || die "Install failed nessus-core"
-	cd ${S}
+	cd "${S}"
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 	insinto /etc/init.d
 	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+	newins "${FILESDIR}"/nessusd-r7 nessusd
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 	# newer version is provided by nessus-libraries
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
index a94b98585fe0..8047c2b4ce4c 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.10 2005/07/28 22:46:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.11 2005/09/19 20:11:41 vanquirius Exp $
 
 inherit toolchain-funcs
 
@@ -11,40 +11,37 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
-IUSE="X tcpd gtk2 debug prelude"
+IUSE="X tcpd debug prelude"
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	X? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
-
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf `use_enable tcpd tcpwrappers` \
 		`use_enable debug` \
 		`use_enable X gtk` \
 		|| die "configure failed"
 	emake -j1 || die "emake failed"
-
 }
 
 src_install() {
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		install || die "Install failed nessus-core"
-	cd ${S}
+	cd "${S}"
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 	insinto /etc/init.d
 	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+	newins "${FILESDIR}"/nessusd-r7 nessusd
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 	# newer version is provided by nessus-libraries
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild
index 3bf76c3c5f47..4c8bc2156dea 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild,v 1.2 2005/07/25 18:57:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild,v 1.3 2005/09/19 20:11:41 vanquirius Exp $
 
 inherit toolchain-funcs eutils gnuconfig
 
@@ -11,17 +11,16 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcpd gtk2 debug prelude"
+IUSE="X tcpd debug prelude"
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	X? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +29,7 @@ src_unpack() {
 
 src_compile() {
 
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf `use_enable tcpd tcpwrappers` \
 		`use_enable debug` \
 		`use_enable X gtk` \
@@ -40,17 +39,17 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		install || die "Install failed nessus-core"
-	cd ${S}
+	cd "${S}"
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 	insinto /etc/init.d
 	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+	newins "${FILESDIR}"/nessusd-r7 nessusd
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 	# newer version is provided by nessus-libraries
 	# should be fixed upstream in version 2.2.6
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild b/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
index 3d34112e7bd8..2aa45b537f0c 100644
--- a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild,v 1.3 2005/07/28 22:46:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild,v 1.4 2005/09/19 20:11:41 vanquirius Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,14 +11,13 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PV}/src/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
-IUSE="tcpd gtk gtk2 debug prelude"
+IUSE="tcpd gtk debug prelude"
 
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	gtk? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	gtk? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
@@ -26,11 +25,11 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc4.diff
+	epatch "${FILESDIR}/${P}-gcc4.diff"
 }
 
 src_compile() {
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf \
 		$(use_enable tcpd tcpwrappers) \
 		$(use_enable debug) \
@@ -44,12 +43,12 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	# net-analyzer/nessus-libraries provides includes.h
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 
-	newinitd ${FILESDIR}/nessusd-r7 nessusd || die "newinitd failed"
+	newinitd "${FILESDIR}"/nessusd-r7 nessusd || die "newinitd failed"
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 }