bump to 1.9.2; 1.9.1-r1 stable on amd64/x86; remove old

(Portage version: 2.1.5_rc6)

4 files changed, 18 insertions, 48 deletions

diff --git a/media-gfx/qtpfsgui/ChangeLog b/media-gfx/qtpfsgui/ChangeLog
index 674a9633e596..cfbdbc0729ec 100644
--- a/media-gfx/qtpfsgui/ChangeLog
+++ b/media-gfx/qtpfsgui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/qtpfsgui
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/ChangeLog,v 1.5 2008/04/12 14:06:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/ChangeLog,v 1.6 2008/05/02 22:27:40 maekke Exp $
+
+*qtpfsgui-1.9.2 (02 May 2008)
+
+  02 May 2008; Markus Meier <maekke@gentoo.org> -qtpfsgui-1.9.0.ebuild,
+  -qtpfsgui-1.9.1.ebuild, qtpfsgui-1.9.1-r1.ebuild, +qtpfsgui-1.9.2.ebuild:
+  bump to 1.9.2; 1.9.1-r1 stable on amd64/x86; remove old
 
 *qtpfsgui-1.9.1-r1 (12 Apr 2008)
 
diff --git a/media-gfx/qtpfsgui/qtpfsgui-1.9.0.ebuild b/media-gfx/qtpfsgui/qtpfsgui-1.9.0.ebuild
deleted file mode 100644
index 1d875411a109..000000000000
--- a/media-gfx/qtpfsgui/qtpfsgui-1.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/qtpfsgui-1.9.0.ebuild,v 1.2 2008/02/09 00:08:54 maekke Exp $
-
-inherit eutils qt4
-
-DESCRIPTION="Qtpfsgui is a graphical user interface that provides a workflow for HDR imaging."
-HOMEPAGE="http://qtpfsgui.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-4.2.3-r1
-	>=media-gfx/exiv2-0.14
-	>=sci-libs/fftw-3.0.1-r2
-	>=media-libs/jpeg-6b-r7
-	>=media-libs/tiff-3.8.2-r2
-	>=media-libs/openexr-1.2.2-r2
-	media-gfx/dcraw"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# no insane CXXFLAGS
-	sed -i -e '/QMAKE_CXXFLAGS/d' project.pro || die
-}
-
-src_compile() {
-	lrelease project.pro || die
-	eqmake4 project.pro PREFIX=/usr || die
-	emake || die
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-}
diff --git a/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild b/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild
index b6665fb4bb8f..5d17356ef2a8 100644
--- a/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild
+++ b/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild,v 1.1 2008/04/12 14:06:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/qtpfsgui-1.9.1-r1.ebuild,v 1.2 2008/05/02 22:27:40 maekke Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/qtpfsgui/qtpfsgui-1.9.1.ebuild b/media-gfx/qtpfsgui/qtpfsgui-1.9.2.ebuild
index 40d8c93b2924..d441f7782258 100644
--- a/media-gfx/qtpfsgui/qtpfsgui-1.9.1.ebuild
+++ b/media-gfx/qtpfsgui/qtpfsgui-1.9.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/qtpfsgui-1.9.1.ebuild,v 1.2 2008/03/16 00:50:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qtpfsgui/qtpfsgui-1.9.2.ebuild,v 1.1 2008/05/02 22:27:40 maekke Exp $
+
+EAPI="1"
 
 inherit eutils qt4
 
@@ -13,13 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-4.2.3-r1
+DEPEND="
+	media-gfx/dcraw
 	>=media-gfx/exiv2-0.14
-	>=sci-libs/fftw-3.0.1-r2
 	>=media-libs/jpeg-6b-r7
-	>=media-libs/tiff-3.8.2-r2
 	>=media-libs/openexr-1.2.2-r2
-	media-gfx/dcraw"
+	>=media-libs/tiff-3.8.2-r2
+	>=sci-libs/fftw-3.0.1-r2
+	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 )
+		>=x11-libs/qt-4.2.3-r1 )"
 
 src_unpack() {
 	unpack ${A}