gentoo resync : 25.09.2019

5 files changed, 143 insertions, 0 deletions

diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index a1ef1658aba0..8d7958356c13 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -4,6 +4,11 @@ AUX luminance-hdr-2.5.1-exiv2-0.27.patch 878 BLAKE2B f8c1cfc71deabab465f0f427413
 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
+AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
+AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
+AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
+DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b
+EBUILD luminance-hdr-2.6.0.ebuild 1836 BLAKE2B 8a4a05b6da97aed587749d8b092f81a8c3c6218c9cc4a8c406bbae3e6ea61eaf1ea698ac1d89662abebc1d3c872041542141686966e919d05240d12b0f60d4e5 SHA512 a2a4763c155f6fc87ab5848f2bc4e84b5881ec82fc430535e3cab2e32ec8e77b1d33af08149b43fc42ac1d7e9f75317484a256f0a9e208abcfc1d0deeb6db8d2
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch
new file mode 100644
index 000000000000..5564ebadc951
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-cmake.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:53:19.496802424 +0200
+@@ -5,19 +5,6 @@
+ CMAKE_POLICY(SET CMP0053 NEW)
+ PROJECT("Luminance HDR")
+ 
+-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$")
+-    message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-else()
+-    message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
+-        "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel")
+-endif()
+-
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$")
+-    message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
+-    add_definitions("-DQT_NO_DEBUG_OUTPUT")
+-endif()
+-
+ # assume built-in pthreads on MacOS
+ IF(APPLE)
+     enable_language(CXX)
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch
new file mode 100644
index 000000000000..982c7ebfac21
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-docs.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:43:41.005292354 +0200
+@@ -413,12 +413,6 @@
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry
+     INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.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/doc) #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.6.0-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch
new file mode 100644
index 000000000000..95fc805e83f9
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.0-no-git.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2019-06-09 21:18:38.000000000 +0200
++++ b/CMakeLists.txt	2019-09-15 23:41:24.684413834 +0200
+@@ -103,11 +103,7 @@
+     set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES})
+ endif()
+ 
+-FIND_PACKAGE(Git)
+-IF(GIT_FOUND)
+-    include(GetGitRevisionDescription)
+-    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+-ENDIF()
++SET(GIT_SHA1 "-- Gentoo build --")
+ 
+ IF(WIN32)
+ 
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
new file mode 100644
index 000000000000..e81c86dd57d8
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+
+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/${P/_/.}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 fits openmp test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+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/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/ilmbase:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/libraw:=
+	media-libs/openexr:=
+	media-libs/tiff:0
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/gsl:=
+	virtual/jpeg:0
+	fits? ( sci-libs/cfitsio:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-no-git.patch
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${PN}-2.5.1-openmp-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() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fits CFITSIO)
+		-DUSE_OPENMP="$(usex openmp)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}