Cleanup.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 5 insertions, 150 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 461f799100c4..63e1eb32028a 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/viking
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.31 2015/04/13 17:42:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.32 2015/05/10 07:06:39 graaff Exp $
+
+  10 May 2015; Hans de Graaff <graaff@gentoo.org> -viking-1.5.1.ebuild,
+  -viking-1.6.ebuild:
+  Cleanup.
 
 *viking-1.6-r1 (13 Apr 2015)
 
diff --git a/sci-geosciences/viking/viking-1.5.1.ebuild b/sci-geosciences/viking/viking-1.5.1.ebuild
deleted file mode 100644
index dea09aa1cf12..000000000000
--- a/sci-geosciences/viking/viking-1.5.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.5.1.ebuild,v 1.3 2015/03/10 18:42:06 graaff Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="http://viking.sourceforge.net/"
-IUSE="doc +exif gps +magic nls"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	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-2.96 )
-	exif? ( media-libs/libexif )
-	magic? ( sys-apps/file )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gpsd-3.13.patch
-}
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--enable-spotmaps \
-		--disable-dem24k \
-		$(use_enable exif geotag) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}.pdf
-	fi
-}
diff --git a/sci-geosciences/viking/viking-1.6.ebuild b/sci-geosciences/viking/viking-1.6.ebuild
deleted file mode 100644
index 4fff311efcca..000000000000
--- a/sci-geosciences/viking/viking-1.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.6.ebuild,v 1.1 2015/04/06 07:10:23 graaff Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="http://viking.sourceforge.net/"
-IUSE="doc +exif gps +magic mapnik nls sqlite3"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	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-2.96 )
-	exif? ( media-libs/libexif )
-	magic? ( sys-apps/file )
-	mapnik? ( sci-geosciences/mapnik )
-	sqlite3? ( dev-db/sqlite:3 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		$(use_enable exif geotag) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable mapnik) \
-		$(use_enable nls) \
-		$(use_enable sqlite3 mbtiles )
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}.pdf
-	fi
-}