Version bump (bug #407967).

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

6 files changed, 211 insertions, 9 deletions

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index 046a78a617d6..6d867f17b342 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.15 2012/02/23 05:24:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.16 2012/03/13 07:58:17 radhermit Exp $
+
+*luminance-hdr-2.2.1 (13 Mar 2012)
+
+  13 Mar 2012; Tim Harder <radhermit@gentoo.org> +luminance-hdr-2.2.1.ebuild,
+  +files/luminance-hdr-2.2.1-docs.patch,
+  +files/luminance-hdr-2.2.1-no-git.patch,
+  +files/luminance-hdr-2.2.1-openmp-automagic.patch:
+  Version bump (bug #407967).
 
   23 Feb 2012; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.2.0.ebuild:
   Respect user CFLAGS and use epatch directly instead of the PATCHES array.
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index a49ffb1c1503..c5cd8ecdacd9 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -5,22 +5,27 @@ AUX luminance-hdr-2.1.0-libraw.patch 311 RMD160 4bc66c7604fe60aa6c8778658b07b791
 AUX luminance-hdr-2.2.0-docs.patch 1017 RMD160 5e083d53b70dd59e7f4fcde784f508f90b1bce5a SHA1 613a324204cbf8accddfc1a342ffc2d632d15fd7 SHA256 07dc7e411fbffab2ce0515f4f39b5bd0407e4442ece3462c320f309010509e0d
 AUX luminance-hdr-2.2.0-no-git.patch 2267 RMD160 426d6e2667f7d389d676ecbf7efa9d26152c7104 SHA1 34761383866c301a43d21ad1e6af29cf31f1cbf1 SHA256 2b60dfd7a0412e1b87c47315c19a5a5ba33088e105392ea07c1b511b75fc5191
 AUX luminance-hdr-2.2.0-openmp-automagic.patch 1736 RMD160 8a0e1527115ae6ff277c305af642f412393881bb SHA1 f7287e71547d2c21f24b09e4e9318895a56cd9eb SHA256 1f23a195963892a0e0cf4653737470fe234137c69c912302bd66b33735fefa7c
+AUX luminance-hdr-2.2.1-docs.patch 750 RMD160 be0641f1f257d0b098a2337bf5d9cc7341b7315f SHA1 386c2d5566b94c5fd12a0b984ee45fc121f37a1f SHA256 9d7ab37083944ad4faa813af51301ee896400b7bb38a07b7143a3a4ca08d511c
+AUX luminance-hdr-2.2.1-no-git.patch 2427 RMD160 5f6d6d263395d219b0fda23865319aa19864fe5e SHA1 47d8a0d13dbad6caf9f47cc16ab759a7e3b6babc SHA256 8c03e1ef4506067c3e40db3aade991fb1c9f9e170d3686d00eeb8bf7b9f006d5
+AUX luminance-hdr-2.2.1-openmp-automagic.patch 1719 RMD160 c4a827066785631a76f66c615ecd760acc8055fe SHA1 c7093f6931b93d40cb0258189a3ed78329c1e791 SHA256 45c316653de319d61d47618598fa4e665508311efdf412d9e31ea817acb1e496
 DIST luminance-hdr-2.1.0.tar.gz 4086574 RMD160 cb3191f41dd9a8e55c91895e6e60f643d7baa4fe SHA1 5bc3f58c3403565cf209c0ef30fc68d5b7c58fd7 SHA256 0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac
 DIST luminance-hdr-2.2.0.tar.bz2 4024364 RMD160 05042de632163c82a14f889934a16f8352d699cd SHA1 7a81a38e944c89249c307497145e6d86164080f2 SHA256 55782b489498bb15911dcdb54bcbffb2604b746e664de809d3bc813a57e10014
+DIST luminance-hdr-2.2.1.tar.bz2 3942721 RMD160 fe3c47d13ef3cc5c652209bf55f8b67976d0ac24 SHA1 da6cc78d597c0a2a10ad723dc0a561263c956ecf SHA256 e6f8439eb03455676eaebfe7b41bfcc3d3ac61d1fb296f12b28783292e75a903
 DIST luminance-hdr_2.0.0.tar.gz 2450689 RMD160 679ada53c67c4c37853ac0153e8acb6fe0ed2df7 SHA1 7981cd1ac8b7e29343ce26288796ddc74cf23ca9 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
 EBUILD luminance-hdr-2.0.0.ebuild 1409 RMD160 117c2999d957444a1cc53552b9098497905030dd SHA1 5c8398206899e3bbaee89bc1a005cb52b4800691 SHA256 4db5cd2ce0c0d249022f4c050fb21d36ef45fb0a0b440fba248961a5cb77f467
 EBUILD luminance-hdr-2.1.0.ebuild 1636 RMD160 e3c9ed8fc853882ce6d2e26d78954fc94a89cebb SHA1 58c8ec79d4c30af3bc4712135a4f0023357eefbf SHA256 ec2c779645abf8ac79f700e1ac6892f1fcd7a180a9d339413969f355d0f3e3b5
 EBUILD luminance-hdr-2.2.0.ebuild 1676 RMD160 f1237aefabebcd59a58518cc7c917250e8b80eab SHA1 6aecb36f7d24df878e70d6db3bb8c9777ca11226 SHA256 be917a017fcb52e52bb9e32d6b3d4122353db3ea04b55efc1e2f17cc527a9bd3
-MISC ChangeLog 5278 RMD160 f07985bb603fc629f783fd1a5c609ea3565f07bc SHA1 d715d0358f2dc77d5b3cc6a879fc8fa5855c74fc SHA256 7c965147efc0131dd034ab55fb5258c0834a9717f72752b0fa3c02a1b47a1823
+EBUILD luminance-hdr-2.2.1.ebuild 1596 RMD160 b28ad08af95a131e48c96091a59abfa64366e841 SHA1 49938195689a80a96e96c23f3d2050154ed6fa89 SHA256 e3d116d879da8dce8c873b4b2b9b4904bc9a94155c911ae0bcc85e1a53fb8771
+MISC ChangeLog 5560 RMD160 43f0d555c1343807ab6962964840f14b586cc726 SHA1 d4e810f6dcf5db354d2b035314b823d11cfd1e6d SHA256 72d48973944fcf83cbb4dc4a99ad0c5bf04ca1beaf824ab0a21fd6109a5279c8
 MISC metadata.xml 937 RMD160 188c7d5bcc2a1f029b36fb4644b45e0d4c42f5f7 SHA1 54bb4fd8c2ff64ddab7173aa25792d588f4977c5 SHA256 03752b3db20bdd5f73b81a4c7ac7a6173b7825c55aef76758cd48db98e778ef6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPRc25AAoJEEqz6FtPBkyjO40IALFPn1femEZ4/l2qlOWgYzFK
-lep/9lbEj5jsd/mHrICWe9lqMopI/h/9rm2MzavSP4+59Wr5KU/m6P5sTg2xiCIx
-cAQ4vx085m/h0ev+OmGuSRCYHqpXqV4fAW6R85nyL7G0/cnAwbm1O9yOaxZx7Tlo
-azJFptUJDcQgsOGfA8t+qFlqEo4dQHEyeQt2y4XyanyHX/BMXLVDAYK3O9ob2Md7
-/JuR/+RoSf4AY1qxJn8hgm0Wc6d4Fzgd/D35H8i7fRKTq+z+61WkzhUFLuJzTplV
-IsSSYLoySsuQ20ka00V3mKdNHgZYubZJZwBv6N1dL3hkOCVbm3dI6ns3QZX7bgI=
-=rIUm
+iQEcBAEBCgAGBQJPXv4jAAoJEEqz6FtPBkyjDIsH/28DLpO9otZl28UtqLmmYWPE
+lmFrrYsUSRL/HzxSGJCjJWWJoEXpuQQK/bY8UEaP5JCRZUy3hQHzOhWbeb8E59Qk
+MJbO9vRMheHRWsM0qqmnD4PktexeLpPNl2ZI2h5HKD6+kJskUkvs6Ep1kALNRl6w
+3z5ud25FZmwqN36avx1Qb0Sau4c3LBE7Kj4a5X6P2I3McgAivY5h8wByzlg5mxms
+pFaQVZgbuL5FXOmN95IhvopvKCdvMS3uv4H1Mes89vJrOZ/C7XyTXFYJy//Op5fr
+qia93LUMQO+00fgr1z+jFgwM+w35z6ZyCQZiZQbTF5YyRKOrv6HrFgEdSu96dwg=
+=iA2g
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch
new file mode 100644
index 000000000000..d44e635dd1b7
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-docs.patch
@@ -0,0 +1,15 @@
+--- luminance-hdr-2.2.1/CMakeLists.txt
++++ luminance-hdr-2.2.1/CMakeLists.txt
+@@ -245,12 +245,6 @@
+     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-hdr) #info files

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

+ # Microsoft Windows

+ ELSEIF(WIN32)

diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch
new file mode 100644
index 000000000000..b3392000e288
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-no-git.patch
@@ -0,0 +1,68 @@
+--- luminance-hdr-2.2.1/CMakeLists.txt
++++ luminance-hdr-2.2.1/CMakeLists.txt
+@@ -34,30 +34,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")

+--- luminance-hdr-2.2.1/src/Common/CMakeLists.txt
++++ luminance-hdr-2.2.1/src/Common/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp @ONLY)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/global.hxx.in ${CMAKE_CURRENT_BINARY_DIR}/global.hxx @ONLY)
+ 
+ #SET(FILES_UI )
+@@ -22,7 +21,6 @@
+ 
+ ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX}
++${CMAKE_CURRENT_BINARY_DIR}/global.hxx)
+-${CMAKE_CURRENT_BINARY_DIR}/global.hxx
+-${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
+ 
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} common PARENT_SCOPE)
+--- luminance-hdr-2.2.1/src/UI/UMessageBox.cpp
++++ luminance-hdr-2.2.1/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.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch
new file mode 100644
index 000000000000..a4fbb13fec7e
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch
@@ -0,0 +1,41 @@
+--- luminance-hdr-2.2.1/CMakeLists.txt
++++ luminance-hdr-2.2.1/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ PROJECT(luminance-hdr)

+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)

+ 

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

++

+ # set include path for FindXXX.cmake files

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

+ 

+@@ -149,18 +151,20 @@
+ SET(LIBS ${LIBS} ${EXIV2_LIBRARIES})

+ 

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

+-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")

++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()

+     ENDIF()

+ ENDIF()

+ # END OpenMP Support

diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild
new file mode 100644
index 000000000000..08f829c5e3b2
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# 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.1.ebuild,v 1.1 2012/03/13 07:58:17 radhermit Exp $
+
+EAPI="4"
+
+inherit cmake-utils toolchain-funcs eutils
+
+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 )
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	# Don't try to define the git version of the release
+	epatch "${FILESDIR}"/${P}-no-git.patch
+
+	# Don't install extra docs and fix install dir
+	epatch "${FILESDIR}"/${P}-docs.patch
+
+	# Fix openmp automagic support
+	epatch "${FILESDIR}"/${P}-openmp-automagic.patch
+}
+
+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 || die ; }
+	done
+}