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

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 57 insertions, 72 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/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
+}