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

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

3 files changed, 86 insertions, 1 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/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
+}