Correct GTK deps (bug 106560).

(Portage version: 2.0.52-r1)

6 files changed, 14 insertions, 41 deletions

diff --git a/x11-misc/gwhere/ChangeLog b/x11-misc/gwhere/ChangeLog
index eb3eae0f7291..63fc92248eaf 100644
--- a/x11-misc/gwhere/ChangeLog
+++ b/x11-misc/gwhere/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gwhere
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/ChangeLog,v 1.13 2005/10/01 15:14:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/ChangeLog,v 1.14 2005/10/01 15:25:09 nelchael Exp $
+
+*gwhere-0.1.6-r1 (01 Oct 2005)
+
+  01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> -gwhere-0.1.6.ebuild,
+  +gwhere-0.1.6-r1.ebuild, -gwhere-0.2.1.ebuild:
+  Correct GTK deps (bug 106560).
 
 *gwhere-0.2.1-r1 (01 Oct 2005)
 
diff --git a/x11-misc/gwhere/Manifest b/x11-misc/gwhere/Manifest
index 9c79fcabecfb..bff9fb282372 100644
--- a/x11-misc/gwhere/Manifest
+++ b/x11-misc/gwhere/Manifest
@@ -1,11 +1,9 @@
 MD5 d9132553ff3ac58f55c5e909f4463f1d gwhere-0.1.4.ebuild 681
-MD5 a5f7269c9c4d55728d724ba4ed4beefb gwhere-0.1.6.ebuild 774
-MD5 a78742953fc8c62cb4bc374e8373bdce gwhere-0.2.1.ebuild 774
-MD5 0ea03f39d1169fa8a5820099c4a12646 ChangeLog 2188
+MD5 81f3ef683863f6ee8dad83865482d915 gwhere-0.1.6-r1.ebuild 705
+MD5 19b8b1c208b00470b06a006ab34a9cd6 ChangeLog 2378
 MD5 93c8e87100085d36fc7e98350f1f2456 metadata.xml 589
 MD5 40e8ed81961448ebbf5a42af727ffda7 gwhere-0.2.1-r1.ebuild 892
 MD5 76c29b3fa9f746876c009f163028e826 files/digest-gwhere-0.1.4 64
-MD5 7db74cd8b365250aac5babbbbde34b31 files/digest-gwhere-0.1.6 64
-MD5 68210241b6b1c33b94a427a4fbb94b51 files/digest-gwhere-0.2.1 65
+MD5 7db74cd8b365250aac5babbbbde34b31 files/digest-gwhere-0.1.6-r1 64
 MD5 68210241b6b1c33b94a427a4fbb94b51 files/digest-gwhere-0.2.1-r1 65
 MD5 9969b9959d1501275b4ec47fb75512d1 files/gwhere-0.2.1-amd64.patch 1937
diff --git a/x11-misc/gwhere/files/digest-gwhere-0.1.6 b/x11-misc/gwhere/files/digest-gwhere-0.1.6-r1
index ed1011e1df8d..ed1011e1df8d 100644
--- a/x11-misc/gwhere/files/digest-gwhere-0.1.6
+++ b/x11-misc/gwhere/files/digest-gwhere-0.1.6-r1
diff --git a/x11-misc/gwhere/files/digest-gwhere-0.2.1 b/x11-misc/gwhere/files/digest-gwhere-0.2.1
deleted file mode 100644
index f5528ec6d6b7..000000000000
--- a/x11-misc/gwhere/files/digest-gwhere-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12d8a1ab33a534a9c390f47952747efd gwhere-0.2.1.tar.gz 1075525
diff --git a/x11-misc/gwhere/gwhere-0.1.6.ebuild b/x11-misc/gwhere/gwhere-0.1.6-r1.ebuild
index 358726232824..93276431c0f0 100644
--- a/x11-misc/gwhere/gwhere-0.1.6.ebuild
+++ b/x11-misc/gwhere/gwhere-0.1.6-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/x11-misc/gwhere/gwhere-0.1.6.ebuild,v 1.2 2005/07/07 11:55:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/gwhere-0.1.6-r1.ebuild,v 1.1 2005/10/01 15:25:09 nelchael Exp $
 
 DESCRIPTION="Removable media cataloger made with GTK+"
 HOMEPAGE="http://www.gwhere.org/"
@@ -10,15 +10,13 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="gtk gtk2 nls"
+IUSE="nls"
 
-DEPEND="!gtk2? ( >=x11-libs/gtk+-1.2 )
-	gtk2? ( >=x11-libs/gtk+-2 )
+DEPEND=">=x11-libs/gtk+-2
 		nls? ( sys-devel/gettext )"
 
 src_compile() {
-	econf `use_enable nls` \
-		      `use_enable gtk gtk20` || die
+	econf `use_enable nls` --enable-gtk20 || die
 	emake || die "emake failed"
 }
 
diff --git a/x11-misc/gwhere/gwhere-0.2.1.ebuild b/x11-misc/gwhere/gwhere-0.2.1.ebuild
deleted file mode 100644
index 757240e8ee6e..000000000000
--- a/x11-misc/gwhere/gwhere-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gwhere/gwhere-0.2.1.ebuild,v 1.1 2005/07/09 18:51:23 smithj Exp $
-
-DESCRIPTION="Removable media cataloger made with GTK+"
-HOMEPAGE="http://www.gwhere.org/"
-SRC_URI="http://www.gwhere.org/download/source/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk gtk2 nls"
-
-DEPEND="!gtk2? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )
-		nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf $(use_enable nls) \
-		      $(use_enable gtk gtk20) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO || die "dodoc failed"
-}