From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 23EA3138010 for ; Mon, 3 Sep 2012 13:28:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C549E21C165; Mon, 3 Sep 2012 13:19:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 91DE421C1B6 for ; Mon, 3 Sep 2012 13:10:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07FBA33D897 for ; Mon, 3 Sep 2012 13:10:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AFD22E5445 for ; Mon, 3 Sep 2012 13:10:40 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1346677739.8586506d120ece015bfd0894e130caedd4e26804.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: media-gfx/photivo/ X-VCS-Repository: proj/qt X-VCS-Files: media-gfx/photivo/metadata.xml media-gfx/photivo/photivo-9999.ebuild X-VCS-Directories: media-gfx/photivo/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 8586506d120ece015bfd0894e130caedd4e26804 X-VCS-Branch: master Date: Mon, 3 Sep 2012 13:10:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a48f5c3c-4abc-4642-b520-2eb9c32144be X-Archives-Hash: 2ce33448d3798d207fbdbd648279dec6 commit: 8586506d120ece015bfd0894e130caedd4e26804 Author: Michael Palimaka gentoo org> AuthorDate: Mon Sep 3 13:08:59 2012 +0000 Commit: Michael Palimaka gentoo 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 @@ -qt + qt + + photivo + http://code.google.com/p/photivo/issues/list + 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() {