Drop old, add missing dependency on dev-util/gtk-doc-am wrt bug 393025 by Nikoli <nikoli@lavabit.com>

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

3 files changed, 8 insertions, 68 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index d48afb72888b..17b4684778e2 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2011/12/03 11:07:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.19 2011/12/27 21:06:09 xarthisius Exp $
+
+  27 Dec 2011; Kacper Kowalik <xarthisius@gentoo.org> -viking-1.2.1.ebuild,
+  viking-1.2.2.ebuild:
+  Drop old, add missing dependency on dev-util/gtk-doc-am wrt bug 393025 by
+  Nikoli <nikoli@lavabit.com>
 
 *viking-1.2.2 (03 Dec 2011)
 
diff --git a/sci-geosciences/viking/viking-1.2.1.ebuild b/sci-geosciences/viking/viking-1.2.1.ebuild
deleted file mode 100644
index e99fa2d6952a..000000000000
--- a/sci-geosciences/viking/viking-1.2.1.ebuild
+++ /dev/null
@@ -1,66 +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-1.2.1.ebuild,v 1.3 2011/07/24 11:20:58 scarabeus Exp $
-
-EAPI=4
-
-inherit base autotools
-
-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
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	gps? ( >=sci-geosciences/gpsd-2.96 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	app-text/rarian
-	dev-libs/libxslt
-	dev-util/pkgconfig
-	sys-devel/gettext
-"
-
-DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gpsd-2.96.patch
-	"${FILESDIR}"/${PN}-curl-7.21.7.patch
-	"${FILESDIR}"/${PV}-autoreconf.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-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 gps realtime-gps-tracking) \
-		$(use_enable nls)
-}
diff --git a/sci-geosciences/viking/viking-1.2.2.ebuild b/sci-geosciences/viking/viking-1.2.2.ebuild
index 9b83e4b9e1a6..92b052dfaf17 100644
--- a/sci-geosciences/viking/viking-1.2.2.ebuild
+++ b/sci-geosciences/viking/viking-1.2.2.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.2.2.ebuild,v 1.1 2011/12/03 11:07:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.2.ebuild,v 1.2 2011/12/27 21:06:09 xarthisius Exp $
 
 EAPI=4
 
@@ -28,6 +28,7 @@ RDEPEND="${COMMONDEPEND}
 "
 DEPEND="${COMMONDEPEND}
 	app-text/gnome-doc-utils
+	dev-util/gtk-doc-am
 	app-text/rarian
 	dev-libs/libxslt
 	dev-util/pkgconfig