gentoo resync : 31.01.2018

6 files changed, 173 insertions, 0 deletions

diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index a7adb61fd781..944c1e135d7f 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -4,6 +4,12 @@ AUX luminance-hdr-2.3.1-openmp-automagic.patch 1646 BLAKE2B fa8be8d602d9b9cbe76b
 AUX luminance-hdr-2.4.0-fits-automagic.patch 1052 BLAKE2B 489563cc4b2aec85ef2238db26fe21325ff625142943e5e1d223a4c04f93433a28f08f23885bd73881439ced4df441d1e0205f4564cd3fdea881eabde7bf1641 SHA512 4aab01ea5e67726a5d15cd0056f1193262227fa653e65a7dd06e3f809837cf217f71e7bbdb5bc3ce54554a97475a0c42b454ba87ed26d33d55e6c17586a48546
 AUX luminance-hdr-2.4.0-qtprinter.patch 3275 BLAKE2B 0fd7f432a52d51b7c64aad530e16d6a6a4dde08c400409718a715a4287852bd4fbf30b96653bc3d68263315cddd5041e1a83546c3649c449f2618bdc6ce05155 SHA512 8ad9056355f19fb74e099321a258b2aca3b9c2aaccd1769b4c7353b999ac881cbfac16f24a5455b21266d5d9b95ecd10b59e5b1f8d72e03143d568016685ff17
 AUX luminance-hdr-2.4.0-qtquick.patch 447 BLAKE2B 82323fcb90f45f02911bfda1595658fe8956303d8962d74a14eae8402ea0c25a23582ee153e25bc69d112cd4051ceabb90e9bda79f71e1f1a74c871c8cbc0ed2 SHA512 71bcc28001970afffd562515f5dde8bbda2c2b28a5915814fe1d17feef34cf1b380bdfff4589ac7d7886f35c7b5ea28df19080c5d682f76789422be7be2494d0
+AUX luminance-hdr-2.5.1-docs.patch 908 BLAKE2B de7c675599a74ef7622c037eeec85546d99f2b3341c6df09f7f8880c7515468295b84962163f147bcf093adbce8425de8f8d86517c81b5c57a3b2dd3afe15ef0 SHA512 d675e6ec2b47c604002a1fa54578fd6d363c0f55079f519e0da3e3b06993b4a77024bd0e35101d22b06c2e7d5fa87bde52b1cbe6c9726ad6e6c02ebe1753bee2
+AUX luminance-hdr-2.5.1-fits-automagic.patch 518 BLAKE2B 47af51ffa1b521d8dd949e2b89c6990896e1b82e64c3cb9f93342bd4343b12ed2824d1b05fe378bb52cd9027fd86848d5a558a787545e86423ebf6da2d402e18 SHA512 49b127165c22864b0910a2cf0ebf694e74b0a8343577f06b752f3d4cdf50ae5990f1fa88b83d78565f16ddcddd0f7f87664a34602ebb1d11efafd0ab979e53ce
+AUX luminance-hdr-2.5.1-no-git.patch 513 BLAKE2B b9a2a460538b709cf76fa3713b26709455bc604e1d30ef355db254b3b6dab7420d81d83e77f6aba7f0f62a8c1b4dfcb3c503004e0235b65ef15d81e461f8a14a SHA512 96e5096a5b1a482f4604e6a6067836268e4988f32907f67ceeee25978d4dd1c1b1e394102145e5241e663595156dddc9c69ab9b22e0e1710e1a0507016b10108
+AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa
 DIST luminance-hdr-2.4.0.tar.bz2 10507522 BLAKE2B b8dc777211b63e4e03466612e1c4b7c685f921db292712c749fc14d9638a69fd735990fd5412c7376a7452911cb15212448afc03aa8407f0d6f9c65fac5d5769 SHA512 aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
+DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 EBUILD luminance-hdr-2.4.0.ebuild 2010 BLAKE2B 725e43d724a797d695dcb8d6d0675442a30dad0b7fa4392daca1e3aafdffc479f30d3d5dc2777df7a8a7dfbbea30ec4a39d937d3f5b77cfeb08e6e7b6008f44c SHA512 017a18d18e0e724e7271f311371e19adadc40cc52a5699cd15f4b6383d4b761d2285833d408fe7db08fd8c2a9b8b0f9a3335f57112cadd40f9d73c6d9434521f
+EBUILD luminance-hdr-2.5.1.ebuild 1942 BLAKE2B fdc60d5f4bf3ee0336e269a7457de2e16547e24bb2865603df2a5fdfff9360f03067e4d607fa99158d7e194ed3c7728998f6738e59ba7a616a5824220e6434c4 SHA512 2412f71b89971d678a41f0301c500986f5c1e24422ca52e4b222f972be4f54f8f8fb6f13b959f81481040f35ea8d2d60d006799ee70bc8f28daf014c510c3a7f
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
new file mode 100644
index 000000000000..48c156a382e3
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.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
+@@ -281,12 +281,6 @@
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/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}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream 
+-    INSTALL(FILES
+-    ${CMAKE_SOURCE_DIR}/AUTHORS
+-    ${CMAKE_SOURCE_DIR}/README.md
+-    ${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
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
+ # Microsoft Windows
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
new file mode 100644
index 000000000000..c3b57861671b
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36cf008..1b75700 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
+ FIND_PACKAGE(JPEG REQUIRED)
+ INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
+ 
+-FIND_PACKAGE(CFITSIO)
++OPTION(USE_FITS "Enable FITS support." ON)
++IF(USE_FITS)
++    FIND_PACKAGE(CFITSIO REQUIRED)
++ENDIF()
++
+ IF(CFITSIO_FOUND)
+     INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR})
+     SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES})
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
new file mode 100644
index 000000000000..8665785736ee
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e8975f..2e5ea5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,11 +59,7 @@ set(LIBS ${LIBS}
+     ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
+     ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
+ 
+-FIND_PACKAGE(Git)
+-IF(GIT_FOUND)
+-    include(GetGitRevisionDescription)
+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+-ENDIF()
++SET(GIT_SHA1 "-- gentoo build --")
+ 
+ IF(WIN32)
+     # Windows Section
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch
new file mode 100644
index 000000000000..f0399d271a59
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-openmp-automagic.patch
@@ -0,0 +1,32 @@
+diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake
+index f55c130..81e1916 100644
+--- a/build_files/Modules/CompilerSettings.cmake
++++ b/build_files/Modules/CompilerSettings.cmake
+@@ -45,16 +45,19 @@ else()
+     message(WARNING "Your C++ compiler does not support C++11.")
+ 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")
++OPTION(USE_OPENMP "Use openmp threading support." ON)
++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/luminance-hdr-2.5.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
new file mode 100644
index 000000000000..8bf884629bcc
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs eutils flag-o-matic
+
+MY_P=${P/_/.}
+DESCRIPTION="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// / l10n_}"
+
+RDEPEND="
+	dev-libs/boost:0=
+	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/qtwebengine: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/cfitsio )
+	sci-libs/gsl
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-cpp/gtest )
+"
+
+DOCS=( AUTHORS BUGS Changelog README.md TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-no-git.patch
+	"${FILESDIR}"/${PN}-2.5.1-docs.patch
+	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.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=(
+		-DUSE_OPENMP="$(usex openmp)"
+		-DUSE_FITS="$(usex fits)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for lang in ${LANGS} ; do
+		if ! use l10n_${lang} ; then
+			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+		fi
+	done
+}