version bump, change jpeg dep to virtual/jpeg

(Portage version: 2.1.9.24/cvs/Linux i686)

5 files changed, 82 insertions, 9 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index abd34b8d0c4b..0ec1bd274260 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/luminance-hdr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.2 2010/06/13 17:06:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.3 2010/11/08 22:53:28 maekke Exp $
+
+*luminance-hdr-2.0.1 (08 Nov 2010)
+
+  08 Nov 2010; Markus Meier <maekke@gentoo.org>
+  luminance-hdr-1.9.2-r1.ebuild, luminance-hdr-1.9.3.ebuild,
+  luminance-hdr-2.0.0.ebuild, +luminance-hdr-2.0.1.ebuild:
+  version bump, change jpeg dep to virtual/jpeg
 
   13 Jun 2010; Markus Meier <maekke@gentoo.org> luminance-hdr-2.0.0.ebuild:
   unset CXXFLAGS, fix LINGUAS handling and update description
diff --git a/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild
index 95811a260e3b..00f4aa4b4f90 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-1.9.2-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/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild,v 1.1 2010/06/05 20:15:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-1.9.2-r1.ebuild,v 1.2 2010/11/08 22:53:28 maekke Exp $
 
 EAPI="1"
 
@@ -26,10 +26,10 @@ done
 DEPEND="
 	media-gfx/dcraw
 	>=media-gfx/exiv2-0.14
-	>=media-libs/jpeg-6b-r7
 	>=media-libs/openexr-1.2.2-r2
 	>=media-libs/tiff-3.8.2-r2
 	>=sci-libs/fftw-3.0.1-r2
+	virtual/jpeg
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild b/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild
index bf3a04fe8d78..68b4a71f1665 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-1.9.3.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/luminance-hdr/luminance-hdr-1.9.3.ebuild,v 1.1 2010/06/05 20:15:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-1.9.3.ebuild,v 1.2 2010/11/08 22:53:28 maekke Exp $
 
 EAPI="2"
 
@@ -23,10 +23,10 @@ IUSE="openmp $(echo ${LANGS//\ /\ linguas_})"
 DEPEND="
 	media-gfx/dcraw
 	>=media-gfx/exiv2-0.14
-	>=media-libs/jpeg-6b-r7
 	>=media-libs/openexr-1.2.2-r2
 	>=media-libs/tiff-3.8.2-r2
 	>=sci-libs/fftw-3.0.1-r2
+	virtual/jpeg
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	>=sys-devel/gcc-4.2[openmp?]"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild
index 8688651c49d7..8ae35f2226ff 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.0.0.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/luminance-hdr/luminance-hdr-2.0.0.ebuild,v 1.2 2010/06/13 17:06:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.0.0.ebuild,v 1.3 2010/11/08 22:53:28 maekke Exp $
 
 EAPI="2"
 
@@ -22,15 +22,15 @@ IUSE="debug openmp"
 DEPEND="
 	media-gfx/dcraw
 	>=media-gfx/exiv2-0.14
-	>=media-libs/jpeg-6b-r7
 	>=media-libs/openexr-1.2.2-r2
 	>=media-libs/tiff-3.8.2-r2
 	>=sci-libs/fftw-3.0.1-r2
 	sci-libs/gsl
+	>=sys-devel/gcc-4.2[openmp?]
+	virtual/jpeg
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
-	x11-libs/qt-webkit:4
-	>=sys-devel/gcc-4.2[openmp?]"
+	x11-libs/qt-webkit:4"
 RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS Changelog README TODO"
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.0.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.0.1.ebuild
new file mode 100644
index 000000000000..b91b3ef9770a
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.0.1.ebuild,v 1.1 2010/11/08 22:53:28 maekke Exp $
+
+EAPI="2"
+
+# hu id
+LANGS="cs de es fr it pl ru tr"
+inherit qt4-r2
+
+OLD_PN="qtpfsgui"
+MY_P="luminance-v${PV}"
+
+DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging."
+HOMEPAGE="http://qtpfsgui.sourceforge.net"
+SRC_URI="mirror://sourceforge/${OLD_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug openmp"
+
+DEPEND="
+	media-gfx/dcraw
+	>=media-gfx/exiv2-0.14
+	>=media-libs/openexr-1.2.2-r2
+	>=media-libs/tiff-3.8.2-r2
+	>=sci-libs/fftw-3.0.1-r2
+	sci-libs/gsl
+	>=sys-devel/gcc-4.2[openmp?]
+	virtual/jpeg
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS Changelog README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# no insane CXXFLAGS
+	sed -i -e '/QMAKE_CXXFLAGS/d' project.pro || die
+
+	if ! use openmp ; then
+		sed -i -e '/QMAKE_LFLAGS/d' project.pro || die
+	fi
+}
+
+src_configure() {
+	lrelease project.pro || die
+	eqmake4 project.pro \
+		PREFIX=/usr \
+		ENABLE_DEBUG="$(use debug && echo YES || echo NO)"
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	for lang in ${LANGS} ; do
+		use linguas_${lang} || rm "${D}"/usr/share/luminance/i18n/lang_${lang}.qm
+	done
+}