Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 94 insertions, 6 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index f25acccaa101..72159e80c099 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2015/03/10 18:42:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.30 2015/04/06 07:10:23 graaff Exp $
+
+*viking-1.6 (06 Apr 2015)
+
+  06 Apr 2015; Hans de Graaff <graaff@gentoo.org> +viking-1.6.ebuild,
+  metadata.xml:
+  Version bump.
 
   10 Mar 2015; Hans de Graaff <graaff@gentoo.org> viking-1.5.1.ebuild,
   +files/viking-1.5.1-gpsd-3.13.patch:
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 5e3360cbb4cb..6a686c0f0509 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX 1.3-autoreconf.patch 381 SHA256 c92829c5674aa7e965a4a4d3d8fd9b6263e9abd25dc9a2d1c31ebd73f9fb5f35 SHA512 d5b55410cf8b37aea7a0e1506e255f185d74d52a9fe9fefca18ccd480cc595f6e4b72215170ac39324400b695f7cdff86e6b108e3e38511e44ad6eafd7a730e9 WHIRLPOOL 586a8a2a5b3edeab94fefd3f7b26039dc70e47d3b9cc2c52c74b12d99e7b0ec7afb382aa39b5449884ac30925ec2ae4163134d1daa724b3c036dd2ab7128845e
 AUX viking-1.5.1-gpsd-3.13.patch 2338 SHA256 8e536f48288fec71dc1d8c4fce695149d46271cf9b8626a5ac14b108f7c490e6 SHA512 ec56b365bb2dac3b3051cf6acd4185c8dac1a58cf2cc566d6dc8ef0936d5e4a527bc9da986140aac655fcfa8bfcf8b272b96b9d5de54af6d494abebadab278fe WHIRLPOOL 4559a81360962ce747c4ff9806ad22332145d618b413b4b514599cc1a092ea278e5af4e13bc729ef39c536504072bd863b84804ef5135302c2cff0e149455d1f
 DIST viking-1.5.1.tar.bz2 1616172 SHA256 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec SHA512 7c6320dd98f1fdfeeadf088223268774efcce899084d5989ebf9ac8f79370c408a427b01ea45a0fd1ad3bbb2ea99767a243666e5c03e0be36204a9fda5be9317 WHIRLPOOL 7e0c9068ffcf131180d1906e3c71825f8762722083523b033c66eb33ef26c228cb80d0846d50b261c55691688fd50c0e17c2342a4cbbfc8e1559d8e6b477126f
+DIST viking-1.6.tar.bz2 3060389 SHA256 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a SHA512 7716f5720bcd410fa4a2a89ff87548c82a83132003733e6a3f516c51df99ffed4fa3b19631cec9ccedd27b222188a0f092c28ab9af1cefd8d8137b5801eff042 WHIRLPOOL 2f50b35e1362e993553f57682b25a7349c92d140c70f85ab3f22bc5a176769d15728ab643a35fd75fc63c836235f734c7e6388c74cfb5e41dfd868dcb9a7ec2d
 DIST viking.pdf 383200 SHA256 b45d2c35c36484f9e3550c2b161fc7c60609e0f1f6f163f73ff70886f5532138 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee WHIRLPOOL b674549c160429de8757f337699d596be2573158a64f6d873b59769eddc1afa8519e4ab0ac8f13f6a36b57da11f85c5f1fa061eb06ba61cdc026bbc4702ab33e
 EBUILD viking-1.5.1.ebuild 1558 SHA256 f107c22d08dec943dcc93d2ab6dabec35ccc98b143e58194fde7d8dff3158525 SHA512 a7131e3d2afcdc1c50dad665facfa3880f5cba8b23f7a33f7d500e89cfc1fc088c540e3ca66d9422ea385fd23a0b66aa10e59a1189ed5d02c1937be50237ebe8 WHIRLPOOL 00f65bd180b25aa6406561bc07ceec802f2bb535a079ba6aca042d3ca44591167109b202c39fdd9ef18bb7d2add8aad988e1c4bdc3afa45751b58e3d960abaab
-MISC ChangeLog 4674 SHA256 770871fa3712195f3d811e5147f942dff9da08c582151d70782f88609c6170f6 SHA512 fb248de7a2400f2f28c2e0e8aadc3f1add45762cd32a2520de2570fab2357fe3c5c21417ee1150538f3c177e5ddea407cb6b8af73e2277cb0114ade5f04b6079 WHIRLPOOL 19b4ceb3dccad1a7306ad06593bcf916c5a19f933e97e91c31cb4969d322ba3678c8b2a06755388cecc337e45ad73ead018f0b285d2ab52d3c6a58f8c20171c2
-MISC metadata.xml 333 SHA256 bb967dc1a9840b18f72aeb0a3625b3bf5924d279e994ff9c8a6e828172159b26 SHA512 44d56cbf00e8a25018d6f4e48c199a45d881ebed9fa4a995443087e3f69ea2bf86af990128b8b635c00e542f3921c1e55db0187781769caa78d837e9d17f08d7 WHIRLPOOL 084764a954207fd73c9179005ff6037c5b94f5e062bda065071a0fb584a909bca781b367cbd1bd50902a99a63edb4c17ed370191a910924782904396b00a3c28
+EBUILD viking-1.6.ebuild 1613 SHA256 8546a03d8a896588f32017833caf039fe7e90801878688a621e8dd1a0e96fa11 SHA512 b1171ac0505f853f59253766c9fdb8d35ac3ff89c28a7cc736917c6e79cdccf0d43dc0f6166c7e93f28e8aad3ebbadd736ff46f2a5b742912313da5ba83d6aad WHIRLPOOL 4975ba1ad3449da3ad3ad22b21b2189c70e3ea2c0650c27b612135a55f7fd9397b3fc44bceba7dbeb2500c8e6ece82fa0f9bb841ebd9dbd6dd05218bbc883689
+MISC ChangeLog 4804 SHA256 68aebb71fe017a0ec5faefc15a4c46ccf85266a57753be22cab40341206684a9 SHA512 cb1f75780e7fdbf160cd893b4f598ae0eba9f4dde659d45719d93d66a4b3f2b3d863142f944ed06e8c356a4ebad5a5c726c48a4bc8698499abf962605e9cc427 WHIRLPOOL 5cb1c6cc01797b6d267f55cd602942d713848866d97c3cf6cdae03313a27a081d297ac15e5c7c8b756d2b106b8b8dfda766d65faa41ea158629e0411d18fbf58
+MISC metadata.xml 535 SHA256 374d429b7845ea575287780edd6d4eb364bc52744b787b6cd28e8b2cc42e2ac7 SHA512 7235ac2a07df0af8c652624b28fa366d1a462d18919976af86af4aeeb5130fd85ccaca45165ffc9b2254bede569e533c1ffecae2794ffb3066d7f2dd4c549120 WHIRLPOOL 8e7b14a6970bb63431f89ab8226b99f501d909f44924ee54f7b962eceef87af0008fdd820c37dcce3077976836f526b60cdaec7a42790eeb16d7eccc47b7d46e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT/Ov8ACgkQiIP6VqMIqNfh3QD9EhBxZDmZq/oJ8OIPM4GUkOwo
-u+0iWPv/CtGA7EKKqmgA/0eTRblqm5/xr4L+UjHyuEihegiZEw2q05QZmki5qe9x
-=AqCD
+iF4EAREIAAYFAlUiMWQACgkQiIP6VqMIqNe/cgD/c5EGNazBaWTKFr6ymPVaG5ea
+pC2+Y7df+IBpKvrCWXwA/1EKggqhDPsn9zw274LBRK0ZIA6+ca2EWLiYXzaJSCan
+=S2WR
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index 043524dc3861..b477eba7c560 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -9,5 +9,11 @@
     <flag name="magic">
       Use libmagic to determine mimetypes
     </flag>
+    <flag name="mapnik">
+      Enable a layer based on <pkg>sci-geosciences/mapnik</pkg>
+    </flag>
+    <flag name="sqlite3">
+      Enable MBTiles support based on <pkg>dev-db/sqlite</pkg>
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-geosciences/viking/viking-1.6.ebuild b/sci-geosciences/viking/viking-1.6.ebuild
new file mode 100644
index 000000000000..4fff311efcca
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6.ebuild
@@ -0,0 +1,74 @@
+# 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
+}