Cleanup ebuild a bit. Remove older.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

3 files changed, 18 insertions, 53 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index fd56f31d61d6..423bdb1065fd 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2011/03/17 12:12:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.12 2011/06/01 09:47:26 scarabeus Exp $
+
+  01 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -viking-0.9.9.ebuild,
+  viking-1.1.ebuild:
+  Cleanup ebuild a bit. Remove older.
 
 *viking-1.1 (17 Mar 2011)
 
diff --git a/sci-geosciences/viking/viking-0.9.9.ebuild b/sci-geosciences/viking/viking-0.9.9.ebuild
deleted file mode 100644
index a6f0e11f4442..000000000000
--- a/sci-geosciences/viking/viking-0.9.9.ebuild
+++ /dev/null
@@ -1,42 +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.9.ebuild,v 1.2 2011/03/06 09:31:24 jlec Exp $
-
-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
-	gps? ( sci-geosciences/gpsd )
-	nls? ( sys-devel/gettext )
-	net-misc/curl
-	sci-geosciences/gpsbabel"
-DEPEND="x11-libs/gtk+:2
-	gps? ( sci-geosciences/gpsd )
-	nls? ( sys-devel/gettext )
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf --enable-openstreetmap \
-		--enable-expedia \
-		--enable-terraserver \
-		--enable-google \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable nls)
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake 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
index 0934e4a06ab4..d956c9240006 100644
--- a/sci-geosciences/viking/viking-1.1.ebuild
+++ b/sci-geosciences/viking/viking-1.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.1.ebuild,v 1.2 2011/06/01 09:47:26 scarabeus Exp $
 
 EAPI=4
 
@@ -16,21 +16,29 @@ KEYWORDS="~amd64 ~ppc ~x86"
 COMMONDEPEND="dev-libs/expat
 	dev-libs/glib:2
 	net-misc/curl
+	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	gps? ( sci-geosciences/gpsd )
-	nls? ( sys-devel/gettext )"
+"
 RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel"
+	sci-geosciences/gpsbabel
+"
 DEPEND="${COMMONDEPEND}
 	app-text/gnome-doc-utils
 	app-text/rarian
-	dev-util/intltool
+	dev-libs/libxslt
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
+
+DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
 
 src_configure() {
 	econf \
+		--disable-deprecations \
+		--with-libcurl \
+		--with-expat \
 		--enable-google \
 		--enable-terraserver \
 		--enable-expedia \
@@ -43,8 +51,3 @@ src_configure() {
 		$(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
-}