Fix USE=exif to depend on gexiv2 by default and add USE=libexif to built against libexif instead, fixing bug 545732.

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

4 files changed, 92 insertions, 6 deletions

diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 72159e80c099..461f799100c4 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2015/04/06 07:10:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.31 2015/04/13 17:42:59 graaff Exp $
+
+*viking-1.6-r1 (13 Apr 2015)
+
+  13 Apr 2015; Hans de Graaff <graaff@gentoo.org> +viking-1.6-r1.ebuild,
+  metadata.xml:
+  Fix USE=exif to depend on gexiv2 by default and add USE=libexif to built
+  against libexif instead, fixing bug 545732.
 
 *viking-1.6 (06 Apr 2015)
 
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 6a686c0f0509..fc816a93a6e6 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -7,13 +7,14 @@ DIST viking-1.5.1.tar.bz2 1616172 SHA256 6c560c8665112732e575110e9a316638cf278f0
 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
+EBUILD viking-1.6-r1.ebuild 1694 SHA256 a4d1ed3ceb8756a539adf3cb60a2d51254cd6810760bf04947f36848bedaaa23 SHA512 f98dbd853198039722c336ce32297e8d7006d2e2765d27d78e6daa456b7ada001cbe7bbbd05ab041a2b91fc6d85d793f202262861f7b1e85f0977c305014453f WHIRLPOOL ac9d98baad8dba59e7ddff24f0196671f3a6e53fa412a96f5f1e28417b91e37dbec5f9ba5cea9c3e4e75e027f481fa83d3944873742b992f17b7ec04d7c97e14
 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
+MISC ChangeLog 5045 SHA256 5f232ded58433715b7d3b1edb4c880162e42b8ac6ae7cd1e1d1c1fcc94e0f7b2 SHA512 9c4cee04a836b48edda445d853005c658bb0a529050c385d05fe7ac637d7023757d6a8ec896fa1e44ead523fccb8a8bf9f4c88aff6c8f2af5c34ed8b4948636c WHIRLPOOL 076bb0033b473ca046cef4804fbe3b03d8ddb32857a195c604be64a7246e58808cc55cab641d2d421fbc8c2cfe22e606b7251f6fbd9e810c372eac24c3d3bdc9
+MISC metadata.xml 630 SHA256 e397416effa4f15b5e8262a34cc6958664b9ca25f2e910d50b34d3cab8d3a51e SHA512 338326f5674c231b7489f4f78e1d5dbb03391d4715aab8150637342334592253821f1f9bbcbc29449f6de5ba5e475f444149dbbb0252dd43b8aefd5d38b65aff WHIRLPOOL 669f6b6866a9bab3d042d34ca9af64069a3a2f92bbf40c1d6eb08518e80533d813f10dc2885e6f323693361249b63b84fab7b8d78691caf0d06964d633fba395
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUiMWQACgkQiIP6VqMIqNe/cgD/c5EGNazBaWTKFr6ymPVaG5ea
-pC2+Y7df+IBpKvrCWXwA/1EKggqhDPsn9zw274LBRK0ZIA6+ca2EWLiYXzaJSCan
-=S2WR
+iF4EAREIAAYFAlUsACwACgkQiIP6VqMIqNeHEwEAkK8O8oEqbEcXYUWDPR6/EM4y
+e0baaVk9M7SJZCMLpAMA/0xVmCP9EB1rP3r/eFhlGhQOni8s2KDOgCpDEuM3jYsi
+=XLN4
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index b477eba7c560..8ff9c0d60d36 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -6,6 +6,9 @@
     <email>graaff@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="libexif">
+      Use <pkg>media-libs/libexif</pkg> for EXIF support
+    </flag>
     <flag name="magic">
       Use libmagic to determine mimetypes
     </flag>
diff --git a/sci-geosciences/viking/viking-1.6-r1.ebuild b/sci-geosciences/viking/viking-1.6-r1.ebuild
new file mode 100644
index 000000000000..7303bf614362
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6-r1.ebuild
@@ -0,0 +1,75 @@
+# 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-r1.ebuild,v 1.1 2015/04/13 17:42:59 graaff Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="http://viking.sourceforge.net/"
+IUSE="doc +exif libexif 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? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	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_with libexif ) \
+		$(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
+}