Version bump and general cleanup, acked by scarabeus. Remove old.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

5 files changed, 60 insertions, 86 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 5e2aae611f40..fd56f31d61d6 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/viking
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.11 2011/03/17 12:12:16 dilfridge Exp $
+
+*viking-1.1 (17 Mar 2011)
+
+  17 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -viking-0.9.8.ebuild, +viking-1.1.ebuild, -files/viking-new-gpsd.diff:
+  Version bump and general cleanup, acked by scarabeus. Remove old.
 
   06 Mar 2011; Justin Lecher <jlec@gentoo.org> viking-0.9.8.ebuild,
   viking-0.9.9.ebuild:
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 0a20cbc4a533..b3b25ed31897 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 1130 RMD160 424d690248b06414b668c4c411d3de93d90afa21 SHA1 3f6c6f160bb980f9273422528fb2ce8b8b1e1b62 SHA256 25ee963a8988cb02044a17f8075b833ded65fdc2fea1d90b1c84f50bb54aa795
+DIST viking-1.1.tar.gz 1012813 RMD160 7950545bd830c24c443fb6894afc1d635f1f83a7 SHA1 15094cef0497e67b9e67959b06b629ce6900eb34 SHA256 5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743
 EBUILD viking-0.9.9.ebuild 1084 RMD160 ee44fe0bfb6cc4e6b0ef379164babbe93a20dc77 SHA1 d080f44206747337a5bfb76d03d7dbd58d390ec7 SHA256 5cbad21fe475de929af067e8e03fca4a17d8f0d7d506d7baaccdc7d912c38c69
-MISC ChangeLog 1529 RMD160 c8dc0a066057a12de5afc108f35d092113868839 SHA1 aa753f805a0a21e6dfb53aa2e7703795c47e4547 SHA256 f3e6f3b78e00fe5590ff70828a56e16ba80b3435dba197fc0d4e520785e5a890
+EBUILD viking-1.1.ebuild 1193 RMD160 864945edd6c92bc5743c697e8428f7e093d02b15 SHA1 e1b62d7e1c43ed85d8df093ac957fb8f9d5ae8fd SHA256 ceb37dc5d4a0d1a90f1eb5aa512e3cc5934efab7530f1a37711af78f4fe0c765
+MISC ChangeLog 1760 RMD160 4917f4daa67c8b795205ae8d9c371066ea388d4d SHA1 dbfc23ac8b0875efab1d9625d53225edf8735d77 SHA256 b6a871cc2edc080fa7b4143f7b8b4e084ad0535e43e63c47fdc6db6d1ed5be5d
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1zVHoACgkQgAnW8HDreRZd3gCgoIhyYMo5LF4GiPlO1Be9kwBA
-rj0AoKer533wIbGYEnV6pAI9W/Gklw5Q
-=tVaB
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/files/viking-new-gpsd.diff b/sci-geosciences/viking/files/viking-new-gpsd.diff
deleted file mode 100644
index 47fd6105344f..000000000000
--- a/sci-geosciences/viking/files/viking-new-gpsd.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
-index d5206bf..d06f5a3 100644
---- a/src/vikgpslayer.c
-+++ b/src/vikgpslayer.c
-@@ -234,8 +234,6 @@ struct _VikGpsLayer {
-   GpsFix realtime_fix;
-   GpsFix last_fix;
- 
--  enum unit realtime_gpsd_unit;
--
-   VikTrack *realtime_track;
-   gchar *realtime_track_name;
- 
-@@ -470,8 +468,6 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp)
-   vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 );
-   vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 );
-   vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc;
--  vgl->realtime_gpsd_unit = gpsd_units();
--  // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit);
-   vgl->realtime_track = NULL;
- 
-   /* Setting params here */
diff --git a/sci-geosciences/viking/viking-0.9.8.ebuild b/sci-geosciences/viking/viking-0.9.8.ebuild
deleted file mode 100644
index 52ccb7cc7b5e..000000000000
--- a/sci-geosciences/viking/viking-0.9.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.4 2011/03/06 09:31:25 jlec Exp $
-
-EAPI="1"
-
-inherit eutils
-
-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
-	gps? ( sci-geosciences/gpsd )
-	net-misc/curl
-	sci-geosciences/gpsbabel"
-DEPEND="x11-libs/gtk+:2
-	gps? ( sci-geosciences/gpsd )
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/viking-new-gpsd.diff"
-}
-
-src_compile() {
-	econf --enable-openstreetmap \
-		--enable-expedia \
-		--enable-terraserver \
-		--enable-google \
-		$(use_enable gps realtime-gps-tracking)
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER \
-		|| die "Unable to install docs"
-}
diff --git a/sci-geosciences/viking/viking-1.1.ebuild b/sci-geosciences/viking/viking-1.1.ebuild
new file mode 100644
index 000000000000..0934e4a06ab4
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.1.ebuild
@@ -0,0 +1,50 @@
+# 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-1.1.ebuild,v 1.1 2011/03/17 12:12:16 dilfridge Exp $
+
+EAPI=4
+
+DESCRIPTION="GPS data editor and analyzer"
+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"
+
+COMMONDEPEND="dev-libs/expat
+	dev-libs/glib:2
+	net-misc/curl
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gps? ( sci-geosciences/gpsd )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMONDEPEND}
+	sci-geosciences/gpsbabel"
+DEPEND="${COMMONDEPEND}
+	app-text/gnome-doc-utils
+	app-text/rarian
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--enable-google \
+		--enable-terraserver \
+		--enable-expedia \
+		--enable-openstreetmap \
+		--enable-bluemarble \
+		--enable-geonames \
+		--enable-geocaches \
+		--enable-spotmaps \
+		--disable-dem24k \
+		$(use_enable gps realtime-gps-tracking) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER
+}