proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

14 files changed, 663 insertions, 0 deletions

diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
new file mode 100644
index 00000000000..4abf41495ad
--- /dev/null
+++ b/media-gfx/luminance-hdr/Manifest
@@ -0,0 +1,3 @@
+DIST luminance-hdr-2.3.0.tar.bz2 5398576 SHA256 dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 SHA512 6806782bec25cde92eeafc1e6a6aeb801226c0db27bd9163829b4556209267a9f5f0ecaae934fbb42a25a780cd131bc34880bc48d6d68867fe1ab117bb4cde08 WHIRLPOOL 8f1430b0e46d53e79e7ba565b73e190b0ad6efb9f2937f8612b0ddda4d442fbc4c31b055a4904c48338e00dc8719cefb94b7f43fff040255f403ebeb4e8aac95
+DIST luminance-hdr-2.3.1.tar.bz2 10323806 SHA256 c2a4764986bf8860d448530f3c8d76143d7504cebb07b3e58e37eb0db5347722 SHA512 d42bcb0cc43594f2ac7d97efd658cfb5a3d34d485ed62822682592a69550c2c00fddbdc202e75fe1617cf1354d44c2f9a83122958d5f4f950380ff5d533191ee WHIRLPOOL 74728c214f9c1d333c2b0afa782cb567d5d6051edfbc875fad9c40c5f33ff2bcdc49ea6d0ea7e37850b62790673cf70dc6b99a2ecca8a0ba8b9b29e64ff9f85a
+DIST luminance-hdr-2.4.0.tar.bz2 10507522 SHA256 14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702 WHIRLPOOL 24c377d8f0b420fde96b1e9055d631668c8285068cec7d5763e94ac91ad24bae2d1cd74ee55b25a28142aaa6ddf3761159ccf28044b690ce817251699234eb8f
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 00000000000..d44e635dd1b
--- /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-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.2.1-openmp-automagic.patch
new file mode 100644
index 00000000000..a4fbb13fec7
--- /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/files/luminance-hdr-2.3.0_beta1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch
new file mode 100644
index 00000000000..040cc8d82a7
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.0_beta1-no-git.patch
@@ -0,0 +1,65 @@
+--- luminance-hdr-2.3.0.beta1/CMakeLists.txt
++++ luminance-hdr-2.3.0.beta1/CMakeLists.txt
+@@ -36,26 +36,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)

+-    FIND_FILE(GIT_EXECUTABLE git.exe 

+-        $ENV{CYGWIN_DIR}\\bin

+-        $ENV{CYGWIN_DIR}

+-    )

+-    IF (EXISTS ${GIT_EXECUTABLE})

+-        SET(GIT_FOUND 1)

+-    ENDIF()

+-ENDIF()

+-

+-IF(GIT_FOUND)

+-    include(GetGitRevisionDescription)

+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)

+-    message(STATUS "Git found")

+-ELSE()

+-    message(STATUS "Git not found")

+-ENDIF()

+-

+ IF(WIN32)

+     # Windows Section

+     

+--- luminance-hdr-2.3.0.beta1/src/Common/CMakeLists.txt
++++ luminance-hdr-2.3.0.beta1/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 
+@@ -25,8 +24,7 @@
+ QT4_WRAP_UI(FILES_UI_H ${FILES_UI})
+ 
+ ADD_LIBRARY(common ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_HXX} ${FILES_UI_H}
+-${CMAKE_CURRENT_BINARY_DIR}/global.hxx
+-${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp)
++${CMAKE_CURRENT_BINARY_DIR}/global.hxx)
+ 
+ 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.0.beta1/src/UI/UMessageBox.cpp
++++ luminance-hdr-2.3.0.beta1/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.3.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
new file mode 100644
index 00000000000..514ded78220
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
@@ -0,0 +1,17 @@
+Don't install extra docs and fix install dir.
+
+--- 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 00000000000..fe95265a684
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
@@ -0,0 +1,54 @@
+Don't try to define the git version of the release.
+
+--- 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 00000000000..69fa0324c6a
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch
@@ -0,0 +1,40 @@
+Only use openmp support if explicitly enabled.
+
+--- 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()
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch
new file mode 100644
index 00000000000..e586c400e42
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch
@@ -0,0 +1,36 @@
+Only use FITS support if explicitly enabled.
+
+--- luminance-hdr-2.4.0/CMakeLists.txt
++++ luminance-hdr-2.4.0/CMakeLists.txt
+@@ -10,6 +10,8 @@
+ include(cmake/CompilerSettings.cmake)
+ include(cmake/Internationalization.cmake)
+ 
++OPTION(USE_FITS "Enable FITS support." ON)
++
+ # find and setup Qt5 for this project
+ 
+ # Tell CMake to run moc when necessary:
+@@ -122,13 +124,15 @@
+ INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR})
+ 
+-FIND_PACKAGE(CCfits)
+-IF(CCFITS_FOUND)
+-    INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS})
+-    SET(LIBS ${LIBS} ${CCFITS_LIBRARIES})
+-    ADD_DEFINITIONS(-DHAVE_CCFITS)
+-ELSE()
+-    message(WARNING "CCfits not found! Building without FITS support!")
++IF(USE_FITS)
++    FIND_PACKAGE(CCfits REQUIRED)
++    IF(CCFITS_FOUND)
++        INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS})
++        SET(LIBS ${LIBS} ${CCFITS_LIBRARIES})
++        ADD_DEFINITIONS(-DHAVE_CCFITS)
++    ELSE()
++        MESSAGE(FATAL_ERROR "CCfits not found!")
++    ENDIF()
+ ENDIF()
+ 
+ SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch
new file mode 100644
index 00000000000..c619308f813
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch
@@ -0,0 +1,99 @@
+From 07e36ef892343b01bf13545866823e6a55044382 Mon Sep 17 00:00:00 2001
+From: Davide Anastasia <davide.anastasia@gmail.com>
+Date: Mon, 29 Sep 2014 08:06:15 +0100
+Subject: [PATCH] Fix QPrinter support
+
+---
+ CMakeLists.txt                  | 25 +++++++++++++------------
+ src/HelpBrowser/CMakeLists.txt  |  3 +--
+ src/HelpBrowser/helpbrowser.cpp |  8 +++++---
+ 3 files changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b07692..8a60ad4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,19 +18,20 @@ include(cmake/Internationalization.cmake)
+   # to always look for includes there:
+   #set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+-find_package(Qt5Core)
+-find_package(Qt5Concurrent)
+-find_package(Qt5Widgets)
+-find_package(Qt5Gui)
+-find_package(Qt5Declarative)
+-find_package(Qt5WebKit)
+-find_package(Qt5WebKitWidgets)
+-find_package(Qt5Xml)
+-find_package(Qt5Sql)
+-find_package(Qt5Network)
+-find_package(Qt5LinguistTools)
++find_package(Qt5Core REQUIRED)
++find_package(Qt5Concurrent REQUIRED)
++find_package(Qt5Widgets REQUIRED)
++find_package(Qt5Gui REQUIRED)
++find_package(Qt5Declarative REQUIRED)
++find_package(Qt5WebKit REQUIRED)
++find_package(Qt5WebKitWidgets REQUIRED)
++find_package(Qt5Xml REQUIRED)
++find_package(Qt5Sql REQUIRED)
++find_package(Qt5Network REQUIRED)
++find_package(Qt5LinguistTools REQUIRED)
++find_package(Qt5PrintSupport REQUIRED)
+ IF(WIN32)
+-	find_package(Qt5WinExtras)
++    find_package(Qt5WinExtras)
+ ENDIF()
+ 
+ # Include the qtmain lib if we are on the windows platform
+diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt
+index 04319a8..2f4916a 100644
+--- a/src/HelpBrowser/CMakeLists.txt
++++ b/src/HelpBrowser/CMakeLists.txt
+@@ -27,9 +27,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
+ 
+-
+ ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
+-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)
++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
+ 
+ SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
+diff --git a/src/HelpBrowser/helpbrowser.cpp b/src/HelpBrowser/helpbrowser.cpp
+index bfd2820..ce7f984 100644
+--- a/src/HelpBrowser/helpbrowser.cpp
++++ b/src/HelpBrowser/helpbrowser.cpp
+@@ -30,6 +30,7 @@ for which a new license (GPL+exception) is in place.
+ #include "ui_HelpBrowser.h"
+ #include "ui_HelpSideBar.h"
+ 
++#include <QDebug>
+ #include <QAction>
+ #include <QBuffer>
+ #include <QDir>
+@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place.
+ #include <QModelIndex>
+ #include <QModelIndexList>
+ #include <QPainter>
+-#include <QPrinter>
+-#include <QPrintDialog>
+ #include <QProcess>
+ #include <QPushButton>
+ #include <QString>
+@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place.
+ #include <QXmlDefaultHandler>
+ #include <QDesktopServices>
+ 
+-#include <QDebug>
++#include <QtPrintSupport/QPrinter>
++#include <QtPrintSupport/QPrintDialog>
++
++
+ 
+ #include "Common/global.h"
+ #include "HelpBrowser/schelptreemodel.h"
+-- 
+2.2.2
+
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch
new file mode 100644
index 00000000000..6e1fc2f16ea
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch
@@ -0,0 +1,13 @@
+Gentoo has a Qt5Quick cmake module instead of a Qt5Declarative one.
+
+--- luminance-hdr-2.4.0/CMakeLists.txt
++++ luminance-hdr-2.4.0/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ find_package(Qt5Concurrent REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+-find_package(Qt5Declarative REQUIRED)
++find_package(Qt5Quick REQUIRED)
+ find_package(Qt5WebKit REQUIRED)
+ find_package(Qt5WebKitWidgets REQUIRED)
+ find_package(Qt5Xml REQUIRED)
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
new file mode 100644
index 00000000000..77a843a5616
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit cmake-utils toolchain-funcs eutils flag-o-matic
+
+MY_P=${P/_/.}
+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/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
+IUSE="cpu_flags_x86_sse2 ${LANGS// / linguas_} openmp"
+
+DEPEND="
+	>=media-gfx/exiv2-0.14
+	media-libs/lcms:2
+	media-libs/libpng
+	>=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[threads]
+	sci-libs/gsl
+	virtual/jpeg
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS Changelog README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	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}"/${PN}-2.3.0_beta1-no-git.patch
+
+	# Don't install extra docs and fix install dir
+	epatch "${FILESDIR}"/${PN}-2.2.1-docs.patch
+
+	# Fix openmp automagic support
+	epatch "${FILESDIR}"/${PN}-2.2.1-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
+		if ! use linguas_${lang} ; then
+			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+		fi
+	done
+}
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.3.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.3.1.ebuild
new file mode 100644
index 00000000000..20b421461f0
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.3.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs eutils flag-o-matic
+
+MY_P=${P/_/.}
+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/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
+IUSE="openmp cpu_flags_x86_sse2 test ${LANGS// / linguas_}"
+
+RDEPEND="
+	dev-libs/boost:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	>=media-gfx/exiv2-0.14:0=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	>=media-libs/libraw-0.13.4:=
+	>=media-libs/openexr-1.2.2-r2:=
+	>=media-libs/tiff-3.8.2-r2:0
+	sci-libs/fftw:3.0[threads]
+	sci-libs/gsl
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS BUGS Changelog README TODO )
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	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
+		if ! use linguas_${lang} ; then
+			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+		fi
+	done
+}
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.4.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.4.0.ebuild
new file mode 100644
index 00000000000..845280760a8
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs eutils flag-o-matic
+
+MY_P=${P/_/.}
+DESCRIPTION="Luminance HDR is a graphical user interface that provides a workflow for HDR imaging"
+HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
+SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
+IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / linguas_}"
+
+RDEPEND="
+	dev-libs/boost:0=
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	>=media-gfx/exiv2-0.14:0=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	>=media-libs/libraw-0.13.4:=
+	media-libs/ilmbase:=
+	>=media-libs/openexr-1.2.2-r2:=
+	>=media-libs/tiff-3.8.2-r2:0
+	sci-libs/fftw:3.0[threads]
+	fits? ( sci-libs/ccfits )
+	sci-libs/gsl
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+DOCS=( AUTHORS BUGS Changelog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-no-git.patch
+	"${FILESDIR}"/${PN}-2.3.1-docs.patch
+	"${FILESDIR}"/${PN}-2.3.1-openmp-automagic.patch
+	"${FILESDIR}"/${P}-fits-automagic.patch
+	"${FILESDIR}"/${P}-qtprinter.patch
+	"${FILESDIR}"/${P}-qtquick.patch
+)
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	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_use_use fits FITS)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for lang in ${LANGS} ; do
+		if ! use linguas_${lang} ; then
+			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+		fi
+	done
+}
diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml
new file mode 100644
index 00000000000..8496ad6a2fa
--- /dev/null
+++ b/media-gfx/luminance-hdr/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>graphics</herd>
+	<longdescription lang="en">
+	Qtpfsgui is an open source graphical user interface application that aims
+	to provide a workflow for HDR imaging.
+
+	Supported HDR formats:
+		* OpenEXR (extension: exr)
+		* Radiance RGBE (extension: hdr)
+		* Tiff formats: 16bit, 32bit (float) and LogLuv (extension: tiff)
+		* Raw image formats (extension: various)
+		* PFS native format (extension: pfs)
+
+	Supported LDR formats:
+		* JPEG, PNG, PPM, PBM, TIFF(8 bit)
+
+	Supported features:
+		* Create an HDR file from a set of images (formats: JPEG, TIFF 8bit and
+			16bit, RAW) of the same scene taken at different exposure setting.
+		* Save and load HDR images.
+		* Rotate and resize HDR images.
+		* Tonemap HDR images.
+		* Copy exif data between sets of images.
+		* Supports internationalization.
+	</longdescription>
+	<use>
+		<flag name="fits">Enable support for the FITS format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LuminanceHDR/LuminanceHDR</remote-id>
+		<remote-id type="sourceforge">qtpfsgui</remote-id>
+	</upstream>
+</pkgmetadata>