Fix +xmp -exif handling, thanks Corbin Simpson in bug #338651. Also remove old beta version

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

3 files changed, 19 insertions, 58 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index 304af27e7565..85312b040416 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.12 2010/07/11 12:47:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.13 2010/10/05 20:43:47 voyageur Exp $
+
+  05 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -geeqie-1.0_beta2-r1.ebuild, geeqie-1.0-r1.ebuild:
+  Fix +xmp -exif handling, thanks Corbin Simpson in bug #338651. Also remove
+  old beta version
 
   11 Jul 2010; Christian Faulhammer <fauli@gentoo.org> geeqie-1.0-r1.ebuild:
   stable x86, bug 324923
diff --git a/media-gfx/geeqie/geeqie-1.0-r1.ebuild b/media-gfx/geeqie/geeqie-1.0-r1.ebuild
index 08060a1daa42..66e33165f632 100644
--- a/media-gfx/geeqie/geeqie-1.0-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r1.ebuild,v 1.5 2010/07/11 12:47:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r1.ebuild,v 1.6 2010/10/05 20:43:47 voyageur Exp $
 
 EAPI=2
 
@@ -27,13 +27,18 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--with-readmedir=/usr/share/doc/${PF} \
-		$(use_enable exif exiv2) \
-		$(use_enable lcms) \
-		$(use_enable lirc) \
-		|| die "econf faild"
+	local myconf="--disable-dependency-tracking
+		--with-readmedir=/usr/share/doc/${PF}
+		$(use_enable lcms)
+		$(use_enable lirc)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf} || die "econf failed"
 }
 
 src_install() {
diff --git a/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild b/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild
deleted file mode 100644
index cc82d51d6c85..000000000000
--- a/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0_beta2-r1.ebuild,v 1.3 2010/02/10 10:44:53 voyageur Exp $
-
-EAPI=2
-
-MY_P="${P/_/}"
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/geeqie/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif lcms lirc xmp"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
-	lcms? ( media-libs/lcms )
-	lirc? ( app-misc/lirc )
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i "${S}/po/Makefile.in.in" || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable exif exiv2) \
-		$(use_enable lcms) \
-		$(use_enable lirc) \
-		|| die "econf faild"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}/usr/share/doc/${MY_P}/COPYING"
-}