bug 106560

(Portage version: 2.0.51.22-r2)

6 files changed, 24 insertions, 83 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 40b5a4925448..9f15f64c50ce 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.49 2005/09/03 16:25:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.50 2005/09/19 19:30:30 vanquirius Exp $
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -mtr-0.67.ebuild,
+  mtr-0.69.ebuild, mtr-0.69-r1.ebuild:
+  Kill gtk2 USE flag for bug 106560.
 
 *mtr-0.69-r1 (03 Sep 2005)
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index d6710d47428a..52f5687d952e 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,10 +1,8 @@
-MD5 8fe99a74d5a26127140f3435860dd4d2 mtr-0.67.ebuild 1296
-MD5 24a16181446e8046321e3f259794bbbd mtr-0.69-r1.ebuild 1471
-MD5 6dcd2450970cd65f5b6182b287b390b4 mtr-0.69.ebuild 1407
+MD5 173dfce9a9337babfd173a7214982814 mtr-0.69-r1.ebuild 1421
+MD5 29be847f9391ce6d393d6dab5913290e mtr-0.69.ebuild 1355
 MD5 6fd1a039deaf9ef9bb871b0ceec28495 ChangeLog 5637
 MD5 720bffd73acf542e859034ca9d443c19 metadata.xml 244
 MD5 0bbdffc84e47f22daaf46c76e941a02a files/mtr-ac-res_mkquery.patch 510
 MD5 1b2fafeb55048e9993c48c330ca7a4bf files/mtr-0.69-debian.patch 2558
-MD5 ed7a57f974bbb8a86b2fc02be7277c94 files/digest-mtr-0.67 60
 MD5 ce43e9fae32e2db595e780b4a4b2fcd8 files/digest-mtr-0.69 60
 MD5 ce43e9fae32e2db595e780b4a4b2fcd8 files/digest-mtr-0.69-r1 60
diff --git a/net-analyzer/mtr/files/digest-mtr-0.67 b/net-analyzer/mtr/files/digest-mtr-0.67
deleted file mode 100644
index 99a4f7737a12..000000000000
--- a/net-analyzer/mtr/files/digest-mtr-0.67
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76347197775ac604d7150ea01502a1df mtr-0.67.tar.gz 131393
diff --git a/net-analyzer/mtr/mtr-0.67.ebuild b/net-analyzer/mtr/mtr-0.67.ebuild
deleted file mode 100644
index 5dcd3eeb685f..000000000000
--- a/net-analyzer/mtr/mtr-0.67.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.67.ebuild,v 1.9 2005/05/03 18:15:03 herbs Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~s390 sparc x86"
-IUSE="gtk gtk2"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=">=sys-libs/ncurses-5.2
-	gtk? (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2 )
-		)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
-}
-
-src_compile() {
-	autoconf || die "autoconf failed"
-
-	local myconf
-	use gtk || myconf="${myconf} --without-gtk"
-
-	append-ldflags -Wl,-z,now
-
-	econf ${myconf} \
-		$(use_enable gtk2) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
-
-	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
-
-	fowners root:wheel /usr/bin/mtr
-	fperms 4710 /usr/bin/mtr
-
-	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.69-r1.ebuild b/net-analyzer/mtr/mtr-0.69-r1.ebuild
index 49ab8afb82a2..8bb3fae288e8 100644
--- a/net-analyzer/mtr/mtr-0.69-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.69-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/mtr/mtr-0.69-r1.ebuild,v 1.1 2005/09/03 16:25:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69-r1.ebuild,v 1.2 2005/09/19 19:30:30 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,21 +11,18 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sparc ~x86"
-IUSE="gtk gtk2 ipv6"
+IUSE="gtk ipv6"
 
 DEPEND="dev-util/pkgconfig"
 RDEPEND=">=sys-libs/ncurses-5.2
-	gtk? (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2 )
-		)"
+	gtk? ( >=x11-libs/gtk+-2 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
 	# bug 104718
-	epatch ${FILESDIR}/${P}-debian.patch
+	epatch "${FILESDIR}/${P}-debian.patch"
 }
 
 src_compile() {
@@ -42,7 +39,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} \
-		$(use_enable gtk2) \
+		$(use_enable gtk gtk2) \
 		$(use_enable ipv6) \
 		|| die "econf failed"
 
@@ -51,12 +48,12 @@ src_compile() {
 
 src_install() {
 	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
 
 	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
 
 	fowners root:wheel /usr/bin/mtr
 	fperms 4710 /usr/bin/mtr
 
-	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
 }
diff --git a/net-analyzer/mtr/mtr-0.69.ebuild b/net-analyzer/mtr/mtr-0.69.ebuild
index 414adcaa886b..771b407e39db 100644
--- a/net-analyzer/mtr/mtr-0.69.ebuild
+++ b/net-analyzer/mtr/mtr-0.69.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/mtr/mtr-0.69.ebuild,v 1.9 2005/08/24 23:25:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69.ebuild,v 1.10 2005/09/19 19:30:30 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,19 +11,16 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc-macos ~s390 sparc x86"
-IUSE="gtk gtk2 ipv6"
+IUSE="gtk ipv6"
 
 DEPEND="dev-util/pkgconfig"
 RDEPEND=">=sys-libs/ncurses-5.2
-	gtk? (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2 )
-		)"
+	gtk? ( >=x11-libs/gtk+-2 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
 }
 
 src_compile() {
@@ -40,7 +37,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} \
-		$(use_enable gtk2) \
+		$(use_enable gtk gtk2) \
 		$(use_enable ipv6) \
 		|| die "econf failed"
 
@@ -49,12 +46,12 @@ src_compile() {
 
 src_install() {
 	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
 
 	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
 
 	fowners root:wheel /usr/bin/mtr
 	fperms 4710 /usr/bin/mtr
 
-	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
 }