[gentoo-commits] proj/qt:master commit in: media-gfx/photivo/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     8586506d120ece015bfd0894e130caedd4e26804
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 13:08:59 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 13:08:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8586506d

[media-gfx/photivo] Fix automagic GIMP dependency wrt bug #431482. Unbundle CImg, bump EAPI.

(Portage version: 2.1.11.13/git/Linux x86_64, unsigned Manifest commit)

---
 media-gfx/photivo/metadata.xml        |    6 +++++-
 media-gfx/photivo/photivo-9999.ebuild |   27 ++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
index dc439f7..ba83034 100644
--- a/media-gfx/photivo/metadata.xml
+++ b/media-gfx/photivo/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="google-code">photivo</remote-id>
+		<bugs-to>http://code.google.com/p/photivo/issues/list</bugs-to>
+	</upstream>
 </pkgmetadata>

diff --git a/media-gfx/photivo/photivo-9999.ebuild b/media-gfx/photivo/photivo-9999.ebuild
index 3ce1379..cdede08 100644
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ b/media-gfx/photivo/photivo-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 inherit qt4-r2 mercurial
 
@@ -14,17 +14,16 @@ EHG_REVISION="default"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-
 IUSE="gimp"
 
-RDEPEND="x11-libs/qt-gui:4
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	|| ( media-libs/jpeg:62 media-libs/libjpeg-turbo )
 	media-gfx/exiv2
+	media-libs/cimg
 	media-libs/lcms:2
 	media-libs/lensfun
 	sci-libs/fftw:3.0
-	media-libs/libpng:1.2
-	>=media-libs/tiff-4.0.0_beta6
 	media-libs/liblqr
 	media-gfx/graphicsmagick[q16,-lcms]
 	gimp? ( media-gfx/gimp )"
@@ -33,12 +32,26 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/hg
 
 src_prepare() {
-#	remove ccache dependency
+	# remove ccache dependency
+	local File
 	for File in $(find "${S}" -type f); do
 		if grep -sq ccache ${File}; then
 			sed -e 's/ccache//' -i "${File}"
 		fi
 	done
+
+	# useless check (no pkgconfig file is provided)
+	sed -e "/PKGCONFIG  += CImg/d" \
+		-i photivoProject/photivoProject.pro || die
+}
+
+src_configure() {
+	local config="WithSystemCImg"
+	if ! use gimp ; then
+		config+=" WithoutGimp"
+	fi
+
+	eqmake4 "CONFIG+=${config}"
 }
 
 src_install() {