Use slot deps for fftw, properly check for openmp support, and die on nonexistent files.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

2 files changed, 16 insertions, 7 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index fb62fae2d3a7..8a94a5aadee1 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/luminance-hdr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.12 2012/02/14 09:33:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.13 2012/02/14 09:41:29 radhermit Exp $
+
+  14 Feb 2012; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.1.0.ebuild:
+  Use slot deps for fftw, properly check for openmp support, and die on
+  nonexistent files.
 
   14 Feb 2012; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.2.0.ebuild:
   Die when trying to remove a nonexistent file.
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild
index f13b1b9f7a7c..ae352d1b4e00 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.1.0.ebuild,v 1.3 2011/09/23 23:43:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild,v 1.4 2012/02/14 09:41:29 radhermit Exp $
 
 EAPI="4"
 
 LANGS="cs de es fr it pl ru tr"
-inherit qt4-r2
+inherit qt4-r2 toolchain-funcs
 
 OLD_PN="qtpfsgui"
 MY_P="${P/_pre/-pre}"
@@ -25,9 +25,8 @@ DEPEND="
 	>=media-libs/libraw-0.13.4
 	>=media-libs/openexr-1.2.2-r2
 	>=media-libs/tiff-3.8.2-r2
-	>=sci-libs/fftw-3.0.1-r2
+	sci-libs/fftw:3.0
 	sci-libs/gsl
-	>=sys-devel/gcc-4.2[openmp?]
 	virtual/jpeg
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
@@ -37,6 +36,12 @@ RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS Changelog README TODO"
 
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
 src_prepare() {
 	qt4-r2_src_prepare
 
@@ -65,6 +70,6 @@ src_install() {
 	qt4-r2_src_install
 
 	for lang in ${LANGS} ; do
-		use linguas_${lang} || rm "${D}"/usr/share/luminance-hdr/i18n/lang_${lang}.qm
+		use linguas_${lang} || { rm "${D}"/usr/share/${PN}/i18n/lang_${lang}.qm || die ; }
 	done
 }