Version bump and update to EAPI 5 (bug #466018).

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 105 insertions, 0 deletions

diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
new file mode 100644
index 000000000000..08b71c78c6b8
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
@@ -0,0 +1,15 @@
+--- luminance-hdr-2.3.1/CMakeLists.txt
++++ luminance-hdr-2.3.1/CMakeLists.txt
+@@ -250,12 +250,6 @@
+ 
+     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.3.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
new file mode 100644
index 000000000000..de4ab4846488
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
@@ -0,0 +1,52 @@
+--- luminance-hdr-2.3.1/CMakeLists.txt
++++ luminance-hdr-2.3.1/CMakeLists.txt
+@@ -32,12 +32,6 @@
+     ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
+     ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+ 
+-FIND_PACKAGE(Git)
+-IF(GIT_FOUND)
+-    include(GetGitRevisionDescription)
+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+-ENDIF()
+-
+ IF(WIN32)
+     # Windows Section
+     
+--- luminance-hdr-2.3.1.orig/src/Common/CMakeLists.txt
++++ luminance-hdr-2.3.1/src/Common/CMakeLists.txt
+@@ -1,5 +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)
+ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+@@ -32,8 +30,7 @@
+ 
+ ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_H}
+     ${CMAKE_CURRENT_BINARY_DIR}/global.hxx
+-    ${CMAKE_CURRENT_BINARY_DIR}/config.h
+-    ${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
++    ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ 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.3.1.orig/src/UI/UMessageBox.cpp
++++ luminance-hdr-2.3.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"
+@@ -92,7 +91,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.3.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch
new file mode 100644
index 000000000000..d83e64e0c21f
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch
@@ -0,0 +1,38 @@
+--- luminance-hdr-2.3.1/cmake/CompilerSettings.cmake
++++ luminance-hdr-2.3.1/cmake/CompilerSettings.cmake
+@@ -8,6 +8,8 @@
+ ENDIF()
+ ENDIF()
+ 
++OPTION(USE_OPENMP "Use openmp threading support." ON)
++
+ #Activate C++11 support, when available
+ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+@@ -39,16 +41,18 @@
+ endif()
+ 
+ #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_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE 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_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE 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()