Version bump (bug #399767).

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

5 files changed, 220 insertions, 2 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index c7ee50dd01bc..7babe7fadab6 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/luminance-hdr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.10 2011/09/23 23:43:07 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.11 2012/02/14 09:15:54 radhermit Exp $
+
+*luminance-hdr-2.2.0 (14 Feb 2012)
+
+  14 Feb 2012; Tim Harder <radhermit@gentoo.org> +luminance-hdr-2.2.0.ebuild,
+  +files/luminance-hdr-2.2.0-docs.patch,
+  +files/luminance-hdr-2.2.0-no-git.patch,
+  +files/luminance-hdr-2.2.0-openmp-automagic.patch:
+  Version bump (bug #399767).
 
   23 Sep 2011; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.1.0.ebuild:
   Add dependency on qt-sql (bug #382305 by Martin Thierer).
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch
new file mode 100644
index 000000000000..4b4bb63b5a83
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-docs.patch
@@ -0,0 +1,21 @@
+--- luminance-hdr-2.2.0/CMakeLists.txt.orig
++++ luminance-hdr-2.2.0/CMakeLists.txt
+@@ -564,16 +564,10 @@
+ 

+     # make install directivies

+     INSTALL(TARGETS luminance-hdr RUNTIME DESTINATION bin) # main exec

+-    INSTALL(FILES ${LUMINANCE_QM} DESTINATION share/luminance/i18n) # i18n

++    INSTALL(FILES ${LUMINANCE_QM} DESTINATION share/luminance-hdr/i18n) # i18n

+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/images/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon

+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry

+-    INSTALL(FILES

+-    ${CMAKE_SOURCE_DIR}/AUTHORS

+-    ${CMAKE_SOURCE_DIR}/README

+-    ${CMAKE_SOURCE_DIR}/LICENSE

+-    ${CMAKE_SOURCE_DIR}/Changelog

+-    DESTINATION share/luminance) #info files

+-    INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance) # help directory

++    INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory

+ 

+ ELSEIF(WIN32)

+ 

diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch
new file mode 100644
index 000000000000..627e0e88ad31
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-no-git.patch
@@ -0,0 +1,72 @@
+--- luminance-hdr-2.2.0.orig/CMakeLists.txt
++++ luminance-hdr-2.2.0/CMakeLists.txt
+@@ -27,30 +27,6 @@
+ 

+ set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})

+ 

+-FIND_PACKAGE(Git)

+-#FIND_PACKAGE(Git QUIET)

+-IF(NOT GIT_FOUND)

+-	message(STATUS "Git not found")

+-    FIND_FILE(GIT_EXECUTABLE git.exe 

+-        $ENV{CYGWIN_DIR}\\bin

+-        $ENV{CYGWIN_DIR}

+-    )

+-    IF (EXISTS ${GIT_EXECUTABLE})

+-        SET(GIT_FOUND 1)

+-    ENDIF()

+-    FIND_FILE(GIT_EXE git

+-        $ENV{/usr/bin}

+-    )

+-    IF (EXISTS ${GIT_EXE})

+-        SET(GIT_FOUND 1)

+-    ENDIF()

+-ENDIF()

+-

+-IF(GIT_FOUND)

+-    include(GetGitRevisionDescription)

+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)

+-ENDIF()

+-

+ IF(WIN32)

+ # Windows Section

+ 	SET(OPENEXR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/../DEPs/include/OpenEXR")

+@@ -318,7 +294,6 @@
+ 	src/UI/UMessageBox.h

+ 	src/Viewers/Histogram.h

+ 	src/Common/global.h

+-	src/Common/GitSHA1.h

+     src/Common/config.h

+ 

+ # new viewer

+@@ -408,11 +383,8 @@
+         src/TonemappingEngine/TonemapOperator.cpp

+ 

+ 	src/main.cpp

+-	${CMAKE_CURRENT_BINARY_DIR}/src/Common/GitSHA1.cpp     # for actual git version

+ )

+ 

+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/Common/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/Common/GitSHA1.cpp" @ONLY)

+-

+ SET(LUMINANCE_HDR_MOC

+ 	src/BatchHDR/BatchHDRDialog.h

+         src/BatchTM/BatchTMDialog.h

+--- luminance-hdr-2.2.0.orig/src/UI/UMessageBox.cpp
++++ luminance-hdr-2.2.0/src/UI/UMessageBox.cpp
+@@ -28,7 +28,6 @@
+ 
+ #include "UI/UMessageBox.h"
+ 
+-#include "Common/GitSHA1.h"
+ #include "Common/config.h"
+ #include "Common/archs.h"
+ #include "ui_about.h"
+@@ -78,7 +77,7 @@
+     ui.authorsBox->setOpenExternalLinks(true);
+     ui.thanksToBox->setOpenExternalLinks(true);
+     ui.GPLbox->setTextInteractionFlags(Qt::TextSelectableByMouse);
+-    ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)).append(" [Build ").append(QString(g_GIT_SHA1).left(6)).append("]"));
++    ui.label_version->setText(ui.label_version->text().append(QString(LUMINANCEVERSION)));
+ 
+     bool license_file_not_found=true;
+     QString docDir = QCoreApplication::applicationDirPath();
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch
new file mode 100644
index 000000000000..20baab7316e7
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.0-openmp-automagic.patch
@@ -0,0 +1,50 @@
+--- luminance-hdr-2.2.0/CMakeLists.txt.orig
++++ luminance-hdr-2.2.0/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)

+ 

+ OPTION(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")

++OPTION(USE_OPENMP "Use openmp threading support." ON)

+ 

+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

+ 

+@@ -141,24 +142,26 @@
+ SET(LIBS ${LIBS} ${EXIV2_LIBRARIES})

+ 

+ #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3

+-IF(MSVC)

++IF(USE_OPENMP)

++	IF(MSVC)

+ 

+-	FIND_PACKAGE(OpenMP REQUIRED)

+-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")

+-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")

+-

+-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)

+-

+-	execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion

+-					OUTPUT_VARIABLE GCC_VERSION)

+-	#MESSAGE(STATUS ${GCC_VERSION})

+-	IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)

+-		message(STATUS "GCC >= 4.3")

+ 		FIND_PACKAGE(OpenMP REQUIRED)

+ 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")

+ 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")

+-	endif()

+ 

++	ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX)

++

++		execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion

++						OUTPUT_VARIABLE GCC_VERSION)

++		#MESSAGE(STATUS ${GCC_VERSION})

++		IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)

++			message(STATUS "GCC >= 4.3")

++			FIND_PACKAGE(OpenMP REQUIRED)

++			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")

++			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")

++		endif()

++

++	ENDIF()

+ ENDIF()

+ # END OpenMP Support

+ 

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild
new file mode 100644
index 000000000000..e7ab68dbcd6b
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.2.0.ebuild
@@ -0,0 +1,67 @@
+# 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.2.0.ebuild,v 1.1 2012/02/14 09:15:54 radhermit Exp $
+
+EAPI="4"
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging."
+HOMEPAGE="http://qtpfsgui.sourceforge.net"
+SRC_URI="mirror://sourceforge/qtpfsgui/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" cs de es fr fi hu id it pl ro ru tr"
+IUSE="${LANGS// / linguas_} openmp"
+
+DEPEND="
+	>=media-gfx/exiv2-0.14
+	>=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
+	sci-libs/gsl
+	virtual/jpeg
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-webkit:4"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS Changelog README TODO )
+
+PATCHES=(
+	# Don't try to define the git version of the release
+	"${FILESDIR}"/${P}-no-git.patch
+
+	# Don't install extra docs and fix install dir
+	"${FILESDIR}"/${P}-docs.patch
+
+	# Fix openmp automagic support
+	"${FILESDIR}"/${P}-openmp-automagic.patch
+)
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use openmp OPENMP)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for lang in ${LANGS} ; do
+		use linguas_${lang} || rm "${D}"/usr/share/${PN}/i18n/lang_${lang}.qm
+	done
+}