gtk 1.2 dependency listing fixes

9 files changed, 78 insertions, 84 deletions

diff --git a/net-analyzer/etherape/etherape-0.8.2.ebuild b/net-analyzer/etherape/etherape-0.8.2.ebuild
index cd7bc77d4ee4..5525093f242d 100644
--- a/net-analyzer/etherape/etherape-0.8.2.ebuild
+++ b/net-analyzer/etherape/etherape-0.8.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.8.2.ebuild,v 1.2 2002/04/24 02:31:17 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.8.2.ebuild,v 1.3 2002/05/23 06:50:15 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
 SRC_URI="http://prdownloads.sourceforge.net/etherape/${P}.tar.gz"
 HOMEPAGE="http://etherape.sourceforge.net/"
 
-DEPEND="	>=x11-libs/gtk+-1.2.10-r3
+DEPEND="	=x11-libs/gtk+-1.2*
 		>=gnome-base/gnome-libs-1.4.1.2-r1
 		>=net-libs/libpcap-0.6.1
 		>=gnome-base/libglade-0.17-r3 "
diff --git a/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild b/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild
index 1049a373d0e7..2ce00b950439 100644
--- a/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild,v 1.1 2002/05/04 03:16:38 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.3-r1.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A commercial-quality network protocol analyzer"
@@ -13,7 +13,7 @@ RDEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.3
 	=dev-libs/glib-1.2*
 	snmp? ( >=net-analyzer/ucd-snmp-4.1.2 )
-	X? ( virtual/x11 >=x11-libs/gtk+-1.2.0 )
+	X? ( virtual/x11 =x11-libs/gtk+-1.2* )
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
 DEPEND="${RDEPEND}
diff --git a/net-analyzer/geotrace/geotrace-0.0.4.ebuild b/net-analyzer/geotrace/geotrace-0.0.4.ebuild
index cb10388735b6..af9ee611663e 100644
--- a/net-analyzer/geotrace/geotrace-0.0.4.ebuild
+++ b/net-analyzer/geotrace/geotrace-0.0.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Aron Griffis <agriffis@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/geotrace/geotrace-0.0.4.ebuild,v 1.3 2002/04/30 09:54:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/geotrace/geotrace-0.0.4.ebuild,v 1.4 2002/05/23 06:50:15 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="geographical traceroute utility"
 SRC_URI="http://geotrace.sourceforge.net/releases/${P}.tar.gz"
 HOMEPAGE="http://geotrace.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.10-r4
+DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.16.0-r1"
 
 RDEPEND="net-misc/traceroute"
diff --git a/net-analyzer/nessus/nessus-1.0.10.ebuild b/net-analyzer/nessus/nessus-1.0.10.ebuild
index 0ccbd686f20d..2648f9e3e44a 100644
--- a/net-analyzer/nessus/nessus-1.0.10.ebuild
+++ b/net-analyzer/nessus/nessus-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2002 Achim Gottinger
 # Distributed under the GPL by Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.10.ebuild,v 1.1 2002/04/05 21:55:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.10.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
 
 
 # It's better to split it in four different packages
@@ -19,12 +19,12 @@ HOMEPAGE="http://www.nessus.org/"
 DEPEND="virtual/glibc virtual/x11 sys-devel/m4
 	>=dev-libs/gmp-3.1.1
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 RDEPEND="virtual/glibc virtual/x11
 	>=dev-libs/gmp-3.1.1
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 
 src_compile() {
diff --git a/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild b/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild
index 3bb75f85af80..633d8a603fc2 100644
--- a/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild
+++ b/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild
@@ -1,6 +1,6 @@
 #Copyright 2000 Achim Gottinger
 #Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
 
 
 # It's better to split it in four different packages
@@ -19,11 +19,11 @@ HOMEPAGE="http://www.nessus.org/"
 DEPEND="virtual/glibc virtual/x11 sys-devel/m4
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 RDEPEND="virtual/glibc virtual/x11
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 src_compile() {
 
diff --git a/net-analyzer/nessus/nessus-1.0.9.ebuild b/net-analyzer/nessus/nessus-1.0.9.ebuild
index 4f3f2483defd..d39eea3761f0 100644
--- a/net-analyzer/nessus/nessus-1.0.9.ebuild
+++ b/net-analyzer/nessus/nessus-1.0.9.ebuild
@@ -1,6 +1,6 @@
 #Copyright 2000 Achim Gottinger
 #Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.9.ebuild,v 1.2 2001/11/15 14:28:36 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.9.ebuild,v 1.3 2002/05/23 06:50:15 seemant Exp $
 
 
 # It's better to split it in four different packages
@@ -19,11 +19,11 @@ HOMEPAGE="http://www.nessus.org/"
 DEPEND="virtual/glibc virtual/x11 sys-devel/m4
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 RDEPEND="virtual/glibc virtual/x11
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 
 src_compile() {
diff --git a/net-analyzer/nessus/nessus-1.2.0.ebuild b/net-analyzer/nessus/nessus-1.2.0.ebuild
index e6ce3aa21270..a03b137fcc3c 100644
--- a/net-analyzer/nessus/nessus-1.2.0.ebuild
+++ b/net-analyzer/nessus/nessus-1.2.0.ebuild
@@ -1,30 +1,27 @@
 # Copyright 2000-2002 Achim Gottinger
 # Distributed under the GPL by Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.2.0.ebuild,v 1.1 2002/04/25 14:19:15 g2boojum Exp $
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.2.0.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
 
 
-# It's better to split it in four different packages
-
-A="nessus-libraries-${PV}.tar.gz nessus-core-${PV}.tar.gz
-   nessus-plugins-${PV}.tar.gz libnasl-${PV}.tar.gz"
 S=${WORKDIR}
 DESCRIPTION="A remote security scanner for Linux"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-libraries-${PV}.tar.gz
-	 ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-core-${PV}.tar.gz
-	 ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-${PV}.tar.gz
-	 ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/libnasl-${PV}.tar.gz"
+SRC_URI="ftp://ftp.nessus.org/pub/${PN}/${P}/src/${PN}-libraries-${PV}.tar.gz
+	 ftp://ftp.nessus.org/pub/${PN}/${P}/src/${PN}-core-${PV}.tar.gz
+	 ftp://ftp.nessus.org/pub/${PN}/${P}/src/${PN}-plugins-${PV}.tar.gz
+	 ftp://ftp.nessus.org/pub/${PN}/${P}/src/libnasl-${PV}.tar.gz"
 
 HOMEPAGE="http://www.nessus.org/"
 
 DEPEND="virtual/glibc virtual/x11 sys-devel/m4
 	>=dev-libs/gmp-3.1.1
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 RDEPEND="virtual/glibc virtual/x11
 	>=dev-libs/gmp-3.1.1
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-1.2.10-r4"
+	=x11-libs/gtk+-1.2*"
 
 
 src_compile() {
@@ -35,40 +32,41 @@ src_compile() {
 	echo "Compiling libraries..."
 	cd ${S}/nessus-libraries
 	./configure \
-		--host=${CHOST} 		\
-		--prefix=/usr 			\
-		--sysconfdir=/etc 		\
-		--localstatedir=/var/state 	\
-		--mandir=/usr/share/man 	\
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/state \
+		--mandir=/usr/share/man \
 		--enable-pthread || die
 	make || die
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cd ${D}/usr/bin
 	cp nessus-config nessus-config.orig
 	sed -e "s:^PREFIX=:PREFIX=${D}:" \
-	-e "s:-I/usr:-I${D}/usr: " nessus-config.orig > nessus-config
+		-e "s:-I/usr:-I${D}/usr: " \
+		nessus-config.orig > nessus-config
 
 
 	echo "Compiling libnasl..."
 	cd ${S}/libnasl
 	./configure \
-		--host=${CHOST} 		\
-		--prefix=/usr 			\
-		--sysconfdir=/etc 		\
-		--localstatedir=/var/state 	\
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/state \
 		--mandir=/usr/share/man	|| die
 	make || die
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cd ${D}/usr/bin
@@ -78,34 +76,34 @@ src_compile() {
 	echo "Compiling core..."
 	cd ${S}/nessus-core
 	./configure \
-		--host=${CHOST} 		\
-		--prefix=/usr 			\
-		--sysconfdir=/etc 		\
-		--localstatedir=/var/state 	\
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/state \
 		--mandir=/usr/share/man || die
 	make || die
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 
 	echo "Compiling plugins..."
 	cd ${S}/nessus-plugins
 	./configure \
-		--host=${CHOST} 		\
-		--prefix=/usr 			\
-		--sysconfdir=/etc 		\
-		--localstatedir=/var/state 	\
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/state \
 		--mandir=/usr/share/man
 	make || die
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 }
@@ -114,36 +112,36 @@ src_install() {
 
 	cd ${S}/nessus-libraries
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cd ${S}/libnasl
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cd ${S}/nessus-core
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cp ${ROOT}/config/nessusd.conf ${D}/etc/nessus/
 
 	cd ${S}/nessus-plugins
 	make \
-		prefix=${D}/usr 		\
-		sysconfdir=${D}/etc 		\
-		localstatedir=${D}/var/state 	\
-		mandir=${D}/usr/share/man 	\
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/var/state \
+		mandir=${D}/usr/share/man \
 		install || die
 
 	cd ${S}/nessus-libraries
@@ -167,7 +165,3 @@ src_install() {
 	insopts -m 755
 	newins ${FILESDIR}/nessusd-r6 nessusd
 }
-
-
-
-
diff --git a/net-analyzer/nmap/nmap-2.54_beta31.ebuild b/net-analyzer/nmap/nmap-2.54_beta31.ebuild
index 710a2c1aacb1..7396cb4ebbf2 100644
--- a/net-analyzer/nmap/nmap-2.54_beta31.ebuild
+++ b/net-analyzer/nmap/nmap-2.54_beta31.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta31.ebuild,v 1.2 2002/04/27 12:46:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta31.ebuild,v 1.3 2002/05/23 06:50:15 seemant Exp $
 
 MY_P="${P/_beta/BETA}"
 S=${WORKDIR}/${MY_P}
@@ -9,7 +9,7 @@ DESCRIPTION="Portscanner"
 SRC_URI="http://www.insecure.org/nmap/dist/${MY_P}.tgz"
 HOMEPAGE="http://www.insecure.org/nmap/"
 DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
+	gtk? ( =x11-libs/gtk+-1.2* )"
 
 src_compile() {													 
 	./configure	\
diff --git a/net-analyzer/nmap/nmap-2.54_beta33.ebuild b/net-analyzer/nmap/nmap-2.54_beta33.ebuild
index 653cd439b0ee..04413c32f7c2 100644
--- a/net-analyzer/nmap/nmap-2.54_beta33.ebuild
+++ b/net-analyzer/nmap/nmap-2.54_beta33.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta33.ebuild,v 1.1 2002/04/27 12:48:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta33.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
 
 MY_P="${P/_beta/BETA}"
 S=${WORKDIR}/${MY_P}
@@ -9,7 +9,7 @@ DESCRIPTION="Portscanner"
 SRC_URI="http://www.insecure.org/nmap/dist/${MY_P}.tgz"
 HOMEPAGE="http://www.insecure.org/nmap/"
 DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
+	gtk? ( =x11-libs/gtk+-1.2* )"
 
 src_compile() {													 
 	./configure	\