Correct Slots for gtk 3 introduction to tree

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 32 insertions, 23 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 32e8c9f3cd50..5e2aae611f40 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/viking
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.9 2010/01/19 11:10:01 hanno Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.10 2011/03/06 09:31:24 jlec Exp $
+
+  06 Mar 2011; Justin Lecher <jlec@gentoo.org> viking-0.9.8.ebuild,
+  viking-0.9.9.ebuild:
+  Correct Slots for gtk 3 introduction to tree
 
 *viking-0.9.9 (19 Jan 2010)
 
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 97d61151ef36..0a20cbc4a533 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX viking-new-gpsd.diff 764 RMD160 5345f5124e4e66295925f4a48e348c09dd9bc5d0 SHA1 ec32e298c882ffb2a09f44e69e205ae77e5f6769 SHA256 d40b98447817ae25a0b4db4b5bea6666cc35bb57cb6ce7aff3e56fd6ab653397
 DIST viking-0.9.8.tar.gz 778565 RMD160 01484eaf1453b9cb8302a14161290d1c2714dbc0 SHA1 fa36293c6e926a20c6d209cbe6e1e0657e83e11d SHA256 4dfc76b477679aa6457953797c037874b1808d28a8e2b4631ca1ddd2a87948c7
 DIST viking-0.9.9.tar.gz 774111 RMD160 5829b909f74c78b5483ae787e6d420909ce4dba2 SHA1 ce3d66ea117e3e179c98477f4fd5c9cf2828c73e SHA256 4189ef2e27ccf900badb063cdec010599a50d84031d828bfae8054be7e2ab55f
-EBUILD viking-0.9.8.ebuild 1164 RMD160 72d1e92eed062adba26ce88d87cd4e66a4e274fe SHA1 448f01b7d4e31ca2b6f4ea99e1f044e1b1d0b50f SHA256 bf03cfdcaec7004a9e543c7a5589958f4452cae83bcbbbae7f6fc64cfccdc94c
-EBUILD viking-0.9.9.ebuild 1117 RMD160 5b2d4179f30038a3e02b55aca4b402c995a2d305 SHA1 69e283cede544d4723f08a94cfadfb689ae0cfd4 SHA256 28f534b69f21414cef8717d1e49377794e2c9ea0955659fb3e40d7c2016802ed
-MISC ChangeLog 1390 RMD160 f3e2ede3c358960c9cead42f0c4b038a72fcbf51 SHA1 29d5f6ab0f44e497b43b900c4a5f239f4ecfdc9e SHA256 9c5d1045893b1ce2bf619732af0958bfa75ea8c4bfb019e992828f2a9f48589c
+EBUILD viking-0.9.8.ebuild 1130 RMD160 424d690248b06414b668c4c411d3de93d90afa21 SHA1 3f6c6f160bb980f9273422528fb2ce8b8b1e1b62 SHA256 25ee963a8988cb02044a17f8075b833ded65fdc2fea1d90b1c84f50bb54aa795
+EBUILD viking-0.9.9.ebuild 1084 RMD160 ee44fe0bfb6cc4e6b0ef379164babbe93a20dc77 SHA1 d080f44206747337a5bfb76d03d7dbd58d390ec7 SHA256 5cbad21fe475de929af067e8e03fca4a17d8f0d7d506d7baaccdc7d912c38c69
+MISC ChangeLog 1529 RMD160 c8dc0a066057a12de5afc108f35d092113868839 SHA1 aa753f805a0a21e6dfb53aa2e7703795c47e4547 SHA256 f3e6f3b78e00fe5590ff70828a56e16ba80b3435dba197fc0d4e520785e5a890
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAktVkxAACgkQr2QksT29OyDowwCeNDE65mk7C55Gfn3Db7qDXbTk
-FyMAn0MjzzunRwcVk7wVdUuaotSKAr+q
-=jfjc
+iEYEARECAAYFAk1zVHoACgkQgAnW8HDreRZd3gCgoIhyYMo5LF4GiPlO1Be9kwBA
+rj0AoKer533wIbGYEnV6pAI9W/Gklw5Q
+=tVaB
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/viking-0.9.8.ebuild b/sci-geosciences/viking/viking-0.9.8.ebuild
index 47860929417e..52ccb7cc7b5e 100644
--- a/sci-geosciences/viking/viking-0.9.8.ebuild
+++ b/sci-geosciences/viking/viking-0.9.8.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.8.ebuild,v 1.3 2009/09/11 22:18:54 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.8.ebuild,v 1.4 2011/03/06 09:31:25 jlec Exp $
+
+EAPI="1"
 
 inherit eutils
 
-DESCRIPTION="Viking is a program to manage GPS data."
+DESCRIPTION="Viking is a program to manage GPS data"
 HOMEPAGE="http://viking.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="gps"
 KEYWORDS="~amd64 ~ppc ~x86"
+
 MAKEOPTS="${MAKEOPTS} -j1"
 
-RDEPEND=">=x11-libs/gtk+-2.2.0
+RDEPEND="x11-libs/gtk+:2
 	gps? ( sci-geosciences/gpsd )
 	net-misc/curl
 	sci-geosciences/gpsbabel"
-DEPEND=">=x11-libs/gtk+-2.2.0
+DEPEND="x11-libs/gtk+:2
 	gps? ( sci-geosciences/gpsd )
 	dev-util/intltool
 	dev-util/pkgconfig"
@@ -33,8 +37,7 @@ src_compile() {
 		--enable-expedia \
 		--enable-terraserver \
 		--enable-google \
-		$(use_enable gps realtime-gps-tracking) \
-		|| die "configure failed"
+		$(use_enable gps realtime-gps-tracking)
 
 	emake || die "emake failed"
 }
diff --git a/sci-geosciences/viking/viking-0.9.9.ebuild b/sci-geosciences/viking/viking-0.9.9.ebuild
index 23b98856774c..a6f0e11f4442 100644
--- a/sci-geosciences/viking/viking-0.9.9.ebuild
+++ b/sci-geosciences/viking/viking-0.9.9.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.9.ebuild,v 1.1 2010/01/19 11:10:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-0.9.9.ebuild,v 1.2 2011/03/06 09:31:24 jlec Exp $
 
-DESCRIPTION="Viking is a program to manage GPS data."
+EAPI="1"
+
+DESCRIPTION="Viking is a program to manage GPS data"
 HOMEPAGE="http://viking.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="gps nls"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND=">=x11-libs/gtk+-2.2.0
+RDEPEND="x11-libs/gtk+:2
 	gps? ( sci-geosciences/gpsd )
 	nls? ( sys-devel/gettext )
 	net-misc/curl
 	sci-geosciences/gpsbabel"
-DEPEND=">=x11-libs/gtk+-2.2.0
+DEPEND="x11-libs/gtk+:2
 	gps? ( sci-geosciences/gpsd )
 	nls? ( sys-devel/gettext )
 	dev-util/intltool
@@ -27,8 +30,7 @@ src_compile() {
 		--enable-terraserver \
 		--enable-google \
 		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable nls) \
-		|| die "configure failed"
+		$(use_enable nls)
 
 	emake || die "emake failed"
 }