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

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

4 files changed, 30 insertions, 72 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/Manifest b/sci-geosciences/viking/Manifest
index 607bcabb6526..f7cbe365bfc0 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,9 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.2.1-autoreconf.patch 454 RMD160 079004a3708f909304945dd324d973ef26885278 SHA1 8272b44044578ab39349ab23592877522b1f4a0f SHA256 4cb58f3d86dc10443f9a1cabd7a132797e5eab1d1072ba65fd034970b5d8a400
 AUX viking-curl-7.21.7.patch 279 RMD160 f721a8de9e1d656b764d6bd96c9fb54201d43300 SHA1 1b83fbd1a2e61532943936459157bc85f8b64f55 SHA256 97a473029b67b194607431171e36af1d834b79b5ea52856465558b196104f2c0
 AUX viking-gpsd-2.96.patch 2162 RMD160 39d74daddc7501db65c7208d0080d5cb82ac4462 SHA1 a7c469194ae04535549b7bac65365be0f66c5652 SHA256 7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902
-DIST viking-1.2.1.tar.gz 1054364 RMD160 609b464db5c4035123199cd3a4c8985e381710db SHA1 594e9ee50dfb93a213399ced9dce72b296b9335a SHA256 7c4b36398a9ec121ab11b66f042d17368dd46cf328a2a0e00bda38fd357a9743
 DIST viking-1.2.2.tar.gz 1050517 RMD160 7dcc257525ff9fa78d86f792fa70d3ab50243753 SHA1 91d53bbf3de6f286e3a0be062974f5b3bef863a7 SHA256 9f96f9bdfc9cae8c65d391f9e972a987ec7f3d9d662a0e4df8bd14282879b10c
-EBUILD viking-1.2.1.ebuild 1409 RMD160 7fa1973407ad378c1d68c86cb0168f956fe9ab6a SHA1 a90f979e794e43174c18f58f7b278d797de9e717 SHA256 bbf8d49b1e262f29999b157b9be02c29e277d0553e299017a6bd20110f45b9f5
-EBUILD viking-1.2.2.ebuild 1367 RMD160 ef42f7e5d0d3904cdd8dc4a9a61190220e7fa43d SHA1 ded55eacb4bf8a148b681d19a5cfef40c8f1acb0 SHA256 b95abc37360b9b055655ab727fbd043674394f3b8fce5c9c15308251efbcf9dc
-MISC ChangeLog 2875 RMD160 13fdd293687e0fa94b0dcf946b462814a820b9cc SHA1 cab34927ed5695802ed7f721ed63aff821d30499 SHA256 7fd9e9f9162884d2725f0264cd02e3e53b43421d36e6020b8f4741ab499c2890
+EBUILD viking-1.2.2.ebuild 1392 RMD160 7014ac9f9079d4d15d494c4e2a6fe4e4d5e16ea0 SHA1 54a7035009a97f68159370dd196e068f722656ff SHA256 355bcbd7fb875fce75f17d15f4c749457c4e2a9a7c6d96fb0ddcd74560d43f06
+MISC ChangeLog 3085 RMD160 01c3297b1c1278059541723e75d00c8fcd23c105 SHA1 f18b101c1c729856d812b026ab1806858494d16d SHA256 b5e858d26f39627377e975a3d371e7682d2e5528108e35842ad39ca2bae77e3b
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJO+jNLAAoJEF0huFKJUZL55MIQAI5LA/07ig6K4hX0nUwOL76g
+McEXJfYYMUmj1RLUJBdvQiboLSYVrIbwtFlJfrP6WQra7ct2mdBuYDt3ow8RG6/Q
+wK6/7vcWBqnUqPnbacc9CJAAXprCOFG66UEbL2FruxYHfhw1e1px+cNIAw1fVJhv
+LsU5Bu7EGPImch9fQmWhveAQM445laBlo2wqwlpGIPJjLRcu5Sx0NQD/kMya9haI
+ljCccFuU4opIRiUpH/RqYZ4lFFoguMMrGmg3JA4jkM6WYbQVPLxpOAcmv283J4aw
+F5Sk113V/cKW5H1Ym5FqQDIglk5ytkN9BzSktxJPUt1+meGE47am9KaBO21Fy0Cf
+QxJb2x/eoQxJDZ4Gx7QvHjuhjrnRUQDLprbXqWi6fE6CW1wQOi0mX/XM0ysLBq6i
+sGN0/BqX/sictpDzwva1c8Mk3Y57rVZXnCn+RnSb6rIUTDLg86vEhaDlTDQPKMdZ
+1XCrxDK9ZMWKQb9SwLp9JTH1A53zpwDE1cY5OEYASNAjquCAY2/IrWFSTnsmyXyk
+mHoGX37g4oC1X1+dV3IWD2ulN4sVNLDOZGEX0gIi1Y/ri+teC2XLybl4hF5nsUOH
+8w/Bd84gA+aOcXYwxuDeid9u7ZWra92dqmtEFc4reQnoBXAEwBVa2wBsmfk9VkwE
+j7Y4VJ16cZfOzKqA7amU
+=Fxbq
+-----END PGP SIGNATURE-----
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