Cleanup ebuild a bit. Remove older.

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

4 files changed, 30 insertions, 57 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/Manifest b/sci-geosciences/viking/Manifest
index b3b25ed31897..fe93985d59a0 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,6 +1,14 @@
-DIST viking-0.9.9.tar.gz 774111 RMD160 5829b909f74c78b5483ae787e6d420909ce4dba2 SHA1 ce3d66ea117e3e179c98477f4fd5c9cf2828c73e SHA256 4189ef2e27ccf900badb063cdec010599a50d84031d828bfae8054be7e2ab55f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-EBUILD viking-1.1.ebuild 1193 RMD160 864945edd6c92bc5743c697e8428f7e093d02b15 SHA1 e1b62d7e1c43ed85d8df093ac957fb8f9d5ae8fd SHA256 ceb37dc5d4a0d1a90f1eb5aa512e3cc5934efab7530f1a37711af78f4fe0c765
-MISC ChangeLog 1760 RMD160 4917f4daa67c8b795205ae8d9c371066ea388d4d SHA1 dbfc23ac8b0875efab1d9625d53225edf8735d77 SHA256 b6a871cc2edc080fa7b4143f7b8b4e084ad0535e43e63c47fdc6db6d1ed5be5d
+EBUILD viking-1.1.ebuild 1199 RMD160 a777ff7596c4a95005d891384108eef5e88aab00 SHA1 0e3803e0c123c426bc478869c4159d2d05bf89c9 SHA256 85beddbec38bc719130eda83c86d800bcab1809a6c3bbc2364cb33738f0e44c4
+MISC ChangeLog 1897 RMD160 2a3f2da75822e808a0ece8fc4156f03a03e87f87 SHA1 274e719384b4ca7a9c97a7b3e624ca9b66bb9ef0 SHA256 e578922201747ba769e12aabbdea7e55bea46bc4d3506f2638e504a7a7e0230e
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3mCrQACgkQHB6c3gNBRYencQCbBShHSfQ5pzYk9ePklDwT7VoF
+82kAn1nME+G5x0cwXc2NNR8hJpwrACHb
+=rZxt
+-----END PGP SIGNATURE-----
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
-}