* [gentoo-commits] proj/qt:master commit in: media-gfx/photivo/
@ 2012-02-03 23:02 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2012-02-03 23:02 UTC (permalink / raw
To: gentoo-commits
commit: bc29b647beaa010d37f3b7b63dea3c3043dcc790
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 23:06:04 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 23:06:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bc29b647
[media-gfx/photivo] Fix several repoman issues.
(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)
---
media-gfx/photivo/metadata.xml | 5 +++++
media-gfx/photivo/photivo-9999.ebuild | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
new file mode 100644
index 0000000..dc439f7
--- /dev/null
+++ b/media-gfx/photivo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/media-gfx/photivo/photivo-9999.ebuild b/media-gfx/photivo/photivo-9999.ebuild
index ff68275..3ce1379 100644
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ b/media-gfx/photivo/photivo-9999.ebuild
@@ -13,7 +13,7 @@ EHG_REVISION="default"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
IUSE="gimp"
@@ -34,7 +34,7 @@ S=${WORKDIR}/hg
src_prepare() {
# remove ccache dependency
- for File in $(find ${S} -type f); do
+ for File in $(find "${S}" -type f); do
if grep -sq ccache ${File}; then
sed -e 's/ccache//' -i "${File}"
fi
@@ -43,10 +43,10 @@ src_prepare() {
src_install() {
qt4-r2_src_install
-
+
if use gimp; then
exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
doexe ptGimp
doexe "mm extern photivo.py"
fi
-}
\ No newline at end of file
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-gfx/photivo/
@ 2012-09-03 13:10 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2012-09-03 13:10 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-gfx/photivo/
@ 2012-12-09 12:19 Markos Chandras
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras @ 2012-12-09 12:19 UTC (permalink / raw
To: gentoo-commits
commit: cf645960b44c7dc01b9335f15a8347009035e4e6
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 9 12:18:57 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Dec 9 12:18:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cf645960
media-gfx/photivo: Move it to gx86
---
media-gfx/photivo/metadata.xml | 9 -----
media-gfx/photivo/photivo-9999.ebuild | 65 ---------------------------------
2 files changed, 0 insertions(+), 74 deletions(-)
diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
deleted file mode 100644
index ba83034..0000000
--- a/media-gfx/photivo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <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
deleted file mode 100644
index cdede08..0000000
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit qt4-r2 mercurial
-
-DESCRIPTION="Photo processor for RAW and Bitmap images"
-HOMEPAGE="http://www.photivo.org"
-EHG_REPO_URI="https://photivo.googlecode.com/hg/"
-EHG_REVISION="default"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="gimp"
-
-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/liblqr
- media-gfx/graphicsmagick[q16,-lcms]
- gimp? ( media-gfx/gimp )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/hg
-
-src_prepare() {
- # 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() {
- qt4-r2_src_install
-
- if use gimp; then
- exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
- doexe ptGimp
- doexe "mm extern photivo.py"
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-09 12:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-03 13:10 [gentoo-commits] proj/qt:master commit in: media-gfx/photivo/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-12-09 12:19 Markos Chandras
2012-02-03 23:02 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox