gentoo resync : 19.03.2019

4 files changed, 29 insertions, 88 deletions

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index cc826b9ef1f2..17c22074077c 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,6 +1,6 @@
-AUX openmittsu-0.9.9.48-disable-googletest.patch 3112 BLAKE2B 3b606abb46eb9756ade71d033a5b145854402079bfb9fca50e08f17a87a7888dee89d1ec54f168080914608be2223d3872793464c8a974653284fcadce320ae1 SHA512 bb6d159ba3ee3e7626f732060014b3d208cc6c91d1a7395feb40011b58a3c0b2b46d57bff8c00d34604a495709a72652b4b02196389f832f24a9144dd9c0e14e
+AUX openmittsu-0.9.13.32-fix-tests.patch 695 BLAKE2B 69dafe6d75ed2ef79f3c208f2566091ce51f8ed32deb85d617b5a74e230c45735e16368e3bfb44f0bf440e8bc503e5295b3cb5f58b9b31e3a7e3e143d883dd4d SHA512 69387e7da115949fe661fd62e3418eab0ad77f2f41f07a767fadbfc96e1561d078c8811ee69e49501b9c410de968e6b8cbc2966446d2c326c601c2d82178467b
 DIST openmittsu-0.9.11.0.tar.xz 1408088 BLAKE2B 6c16ea2c35c0a4e02b2735d292516e22c238ca6d3f32f2869be8fec265f099761a5afef0303b2bd84c8f2e5383d7fff6dd18b2e57fc0d12da30a8d8a1637242b SHA512 534a589aa7bf4aa1be4e7d887ef1d4b025eeb1f82d8503cb048a7802ad4380c78224acae4a5f41a56be838a5a43af78f496bd0336034232208bc4de49a71b4d5
-DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
+DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f
 EBUILD openmittsu-0.9.11.0.ebuild 1552 BLAKE2B a925b0b7f2754d5bd37eb577dbac8d95a5f38663f4905ea9829f0a8a11761416a920959094c8c7f5420e2c64281e7ede341a3cce8b1343e7bd41de922158627b SHA512 e941e731bbb627b888097d013a71ac66d4cbdf4fe0ee8e316f4d0ef75fcb792a5def6dc0817d607c78504bf80fbd9b9dd3ad0dbe9f9b89ce9bc7d869c42a0475
-EBUILD openmittsu-0.9.9.48.ebuild 1421 BLAKE2B c73a4fc1044489a11556de6bdd1271aea12a2c81e74a3dce35b04bb37e5743613617739a0983665ea719b7c43260e4583333c9aa9239c01d0547f73ed4d3e0d0 SHA512 32ba61e2e722882a882b17a6333329b9219c9ca61e7631e4333ded39be00f1224a72585bc38b7ab01c730c8878e36d88d48bb0f5bc8ffea8489b82a53d3db417
+EBUILD openmittsu-0.9.13.32.ebuild 1598 BLAKE2B bbf31597b0559fb492592dc64188ce651361e6bf5bc46c6a6008aa9ec7db2df1e823214d3c08150f37ddc49e5b34643d57f7f786d76d1f2bcf67478b2053f6a0 SHA512 e9b498e0a9c21425a5e3b1443855d6e214fb39d1fd7588f6dfcc966bce2e1967268862d476ff1aff9ef247390302ec606ad0bb7804886baf851a2ee9cf4e7f59
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
new file mode 100644
index 000000000000..c89d24536ae9
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
@@ -0,0 +1,11 @@
+--- openmittsu-0.9.13.32-orig/CMakeLists.txt
++++ openmittsu-0.9.13.32/CMakeLists.txt
+@@ -570,7 +570,7 @@
+ target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql)
+ target_link_libraries(openMittsuVersionInfo Qt5::Core)
+ if (OPENMITTSU_ENABLE_TESTS)
+-	target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest)
++	target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread)
+ endif (OPENMITTSU_ENABLE_TESTS)
+ 
+ # Link against libc++abi if requested.
diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
deleted file mode 100644
index ceb162d5e6b1..000000000000
--- a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Disable googletest for now, in order to avoid accessing the network
-at configure time.
-
---- openmittsu-0.9.9.48-orig/CMakeLists.txt
-+++ openmittsu-0.9.9.48/CMakeLists.txt
-@@ -212,28 +212,6 @@
- # Add the binary dir include directory
- include_directories("${PROJECT_BINARY_DIR}/include")
- 
--##########################################################
--#
--# Google Testing Framework
--#
--##########################################################
--# Download and unpack googletest at configure time
--configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt)
--execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
--  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
--execute_process(COMMAND "${CMAKE_COMMAND}" --build .
--  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
-- 
--# Prevent GoogleTest from overriding our compiler/linker options
--# when building with Visual Studio
--set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-- 
--# Add googletest directly to our build. This adds
--# the following targets: gtest, gtest_main, gmock
--# and gmock_main
--add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
--                 "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL)
-- 
- 
- # Main Sources
- file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
-@@ -399,24 +377,17 @@
- 
- add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED})
- 
--add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES}
--	${OPENMITTSU_RESOURCESOURCES}
--)
--
- if (MSVC)
- 	set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
- endif(MSVC)
- 
- # Add target link dependencies
--target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest)
-+target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES})
- target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY})
- 
--add_dependencies(openMittsuTests gtest)
--
- # Use the required modules from Qt 5.
- target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
--target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsuVersionInfo Qt5::Core)
- 
- # Link against libc++abi if requested.
-@@ -424,7 +395,6 @@
- 	target_link_libraries(openMittsu "c++abi")
- 	target_link_libraries(openMittsuCore "c++abi")
- 	target_link_libraries(openMittsuVersionInfo "c++abi")
--	target_link_libraries(openMittsuTests "c++abi")
- endif(OPENMITTSU_LINK_LIBCXXABI)
- 
- # Targets, CPACK...
-@@ -438,10 +408,6 @@
-    RUNTIME
-    DESTINATION bin
-    COMPONENT installComponent)
--install(TARGETS openMittsuTests
--   RUNTIME
--   DESTINATION bin
--   COMPONENT installComponent)
-    
- if (MSVC)
- 	set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe")
diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
index 241dd833295c..5c132dd83ec7 100644
--- a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils desktop
 
@@ -10,11 +10,12 @@ HOMEPAGE="https://www.openmittsu.de/"
 # git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
 
-DEPEND="dev-db/qt5-sqlcipher
+RDEPEND="dev-db/qt5-sqlcipher
 	>=dev-libs/libsodium-1.0.11:=
 	>=dev-qt/qtcore-5.7.1:5=
 	>=dev-qt/qtgui-5.7.1:5=
@@ -23,10 +24,11 @@ DEPEND="dev-db/qt5-sqlcipher
 	>=dev-qt/qtsql-5.7.1:5=[sqlite]
 	>=dev-qt/qtwidgets-5.7.1:5=
 	>=media-gfx/qrencode-3.4.4-r1:="
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0 )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-disable-googletest.patch
+	"${FILESDIR}"/${P}-fix-tests.patch
 )
 
 DOCS=(
@@ -40,14 +42,21 @@ src_configure() {
 		# set version manually, since autodetection works only with git
 		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
 		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
 	)
 	cmake-utils_src_configure
 }
 
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./openMittsuTests || die
+}
+
 src_install() {
 	local my_pn="openMittsu"
 	cmake-utils_src_install
 	newicon resources/icon.png ${my_pn}.png
 	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
 	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
 }