So compnerds like "Wanna fix these ebuilds to be gtk USE flag only?" so Im like "Coo" (actually I argued with him about it for 2 days). So.. here it is! Back to dinner

(Portage version: 2.1.1_pre5-r3)

7 files changed, 29 insertions, 25 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 0a224186c5a4..189ff1e08909 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/jpilot
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.29 2006/05/30 21:16:45 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.30 2006/08/29 03:54:47 chriswhite Exp $
+
+  29 Aug 2006; Chris White <chriswhite@gentoo.org> jpilot-0.99.7-r1.ebuild,
+  jpilot-0.99.8_pre9.ebuild, jpilot-0.99.8.ebuild, jpilot-0.99.8-r1.ebuild:
+  gtk2 -> gtk conversion.
 
 *jpilot-0.99.8-r1 (30 May 2006)
 
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.7-r1 b/app-pda/jpilot/files/digest-jpilot-0.99.7-r1
index 024af85ec8e4..c98794c61790 100644
--- a/app-pda/jpilot/files/digest-jpilot-0.99.7-r1
+++ b/app-pda/jpilot/files/digest-jpilot-0.99.7-r1
@@ -1 +1,3 @@
 MD5 11bb7236702e2e4c7e3d06372bdc9695 jpilot-0.99.7.tar.gz 1197119
+RMD160 04516b0be321addaf636205372483178dff5c839 jpilot-0.99.7.tar.gz 1197119
+SHA256 f9d5812b480dee9fddc112f1c461cad69eaabb2229ee6f0e1caffff9dfbdfae5 jpilot-0.99.7.tar.gz 1197119
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9 b/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9
index ad562b8f3193..332707dd3f3f 100644
--- a/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9
+++ b/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9
@@ -1 +1,3 @@
 MD5 7747fedeffc64ecd3185a40477062fcc jpilot-0.99.8-pre9.tar.gz 1394323
+RMD160 e90793dd896faeb0a2b54cfd8a21ff0a7730f2a2 jpilot-0.99.8-pre9.tar.gz 1394323
+SHA256 5da78c1e23a3a0212c064918546cb7f1dde3851dfd35b8564f855900b85f81b5 jpilot-0.99.8-pre9.tar.gz 1394323
diff --git a/app-pda/jpilot/jpilot-0.99.7-r1.ebuild b/app-pda/jpilot/jpilot-0.99.7-r1.ebuild
index be6f01aea57e..dc7769322c02 100644
--- a/app-pda/jpilot/jpilot-0.99.7-r1.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.7-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/app-pda/jpilot/jpilot-0.99.7-r1.ebuild,v 1.9 2006/03/28 01:05:50 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.7-r1.ebuild,v 1.10 2006/08/29 03:54:47 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -11,13 +11,12 @@ SRC_URI="http://jpilot.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="nls gtk2"
+IUSE="nls gtk"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( >=x11-libs/gtk+-1.2 )
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	>=app-pda/pilot-link-0.11.5"
 DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -32,7 +31,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable gtk2) $(use_enable nls) || die "configure failed"
+	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
 	emake -j1 || die "make failed"
 }
 
diff --git a/app-pda/jpilot/jpilot-0.99.8-r1.ebuild b/app-pda/jpilot/jpilot-0.99.8-r1.ebuild
index 5c8ef450212d..b6ddae062788 100644
--- a/app-pda/jpilot/jpilot-0.99.8-r1.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.8-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/app-pda/jpilot/jpilot-0.99.8-r1.ebuild,v 1.1 2006/05/30 21:16:45 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8-r1.ebuild,v 1.2 2006/08/29 03:54:47 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -11,13 +11,12 @@ SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk2"
+IUSE="nls gtk"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( >=x11-libs/gtk+-1.2 )
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	>=app-pda/pilot-link-0.11.5"
 DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -34,7 +33,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable gtk2) $(use_enable nls) || die "configure failed"
+	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
 	emake -j1 || die "make failed"
 }
 
diff --git a/app-pda/jpilot/jpilot-0.99.8.ebuild b/app-pda/jpilot/jpilot-0.99.8.ebuild
index b2ddf39a9cdb..db5382bb8039 100644
--- a/app-pda/jpilot/jpilot-0.99.8.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.8.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/app-pda/jpilot/jpilot-0.99.8.ebuild,v 1.1 2006/03/28 13:05:50 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8.ebuild,v 1.2 2006/08/29 03:54:47 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -11,13 +11,12 @@ SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk2"
+IUSE="nls gtk"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( >=x11-libs/gtk+-1.2 )
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	>=app-pda/pilot-link-0.11.5"
 DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -33,7 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable gtk2) $(use_enable nls) || die "configure failed"
+	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
 	emake -j1 || die "make failed"
 }
 
diff --git a/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild b/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild
index 22a98ef44ae0..28e36de7b76f 100644
--- a/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.8_pre9.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/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild,v 1.2 2006/03/28 01:05:50 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild,v 1.3 2006/08/29 03:54:47 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -13,13 +13,12 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/jpilot/jpilot-${MY_PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk2"
+IUSE="nls gtk"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( >=x11-libs/gtk+-1.2 )
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	>=app-pda/pilot-link-0.11.5"
 DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )
+	gtk? ( dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -32,7 +31,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable gtk2) $(use_enable nls) || die "configure failed"
+	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
 	emake -j1 || die "make failed"
 }