gentoo resync : 28.04.2021

3 files changed, 6 insertions, 71 deletions

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 495b495fe881..63c5dfa2705f 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,6 +1,4 @@
 AUX openmittsu-0.9.13.32-fix-tests.patch 695 BLAKE2B 69dafe6d75ed2ef79f3c208f2566091ce51f8ed32deb85d617b5a74e230c45735e16368e3bfb44f0bf440e8bc503e5295b3cb5f58b9b31e3a7e3e143d883dd4d SHA512 69387e7da115949fe661fd62e3418eab0ad77f2f41f07a767fadbfc96e1561d078c8811ee69e49501b9c410de968e6b8cbc2966446d2c326c601c2d82178467b
-DIST openmittsu-0.9.13.46.tar.xz 2183136 BLAKE2B 3935a00fae8aa937fdc2f629a7dbf2a06cf518fb3758e7c1e191247004fa4077f60dbe2a0e3fba9750405ec069c33b6336cc26f990947ecbb1dabfe3b7b586f6 SHA512 bd58189e7c714f74ec6271a94251f4222dcd4fdb8015d6d01ef57e860804ebfa97aab632f3db94da386bb58bbb674bb4db6b659d2c9ccdeedf8ddd9b026a99c4
 DIST openmittsu-0.9.15.0.tar.xz 2302908 BLAKE2B 2800004968a1965d0c91197402618ae4ebaeb7a7d977e79654f296d7d2ca1466d26b86d99810e0502e9eced27e5a664dbb4b0113ec344367fb7b85557ebc0381 SHA512 9e00828053506cf233a4cede49c501da903cc36d49379b891e4186cf10cacfbd596b4d2b7ac551e2e6340a878bfa1155f8696e179ed9dd1c2ecbff61430ed7f9
-EBUILD openmittsu-0.9.13.46.ebuild 1645 BLAKE2B ad9c3d84d905524b88af8a16921ccbc8815afddd9bcb86e9073a8d7fdd19bfecf1aebdf054787faa0426e29b14b5727f28c9b5649c4f8d7a352f5f708c95d311 SHA512 9a12d885e497b4d66fe40684a6ab143e92817c693682c5596374eeca3ace811a6ee5c7a2afcb9b64fe91022e20390925dcd0d4b54bc641e0fa8f3c5504a8f567
-EBUILD openmittsu-0.9.15.0.ebuild 1645 BLAKE2B 258e4a5f65cbee5811619e79aab691794e08ae61e2a976e96730e52da56fe4faec4c0dd7456805679423075a5ba687026befb6915019d90a9189288513cf3bc4 SHA512 a8e92c610fa856f79128244dbaf7d8f55702b9273de8f00f993027c9c6ada3b508f31e9171189165e67966e0b10b06a45a5fc1e4f4c134b79944e8605eef8a58
+EBUILD openmittsu-0.9.15.0.ebuild 1624 BLAKE2B 0d4be051a1c4e67b7590eef6b55212bf34f3acd376cb1d18a83f4a04c5411991f886833f6656f48147e39a3a24ece2a9d10d5346d3e3f5a168c80d0823e06890 SHA512 5318542347e7f8199520255fb067aac227c266ede9cf968300e249005ce9a40039ea7e86c3ef7f9bb4816e758e954181b816d29f2cd1f41fec347ac0caeb8d3d
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/openmittsu-0.9.13.46.ebuild b/net-im/openmittsu/openmittsu-0.9.13.46.ebuild
deleted file mode 100644
index 3689bcc19f9e..000000000000
--- a/net-im/openmittsu/openmittsu-0.9.13.46.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop
-
-DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
-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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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=
-	>=dev-qt/qtmultimedia-5.7.1:5=[widgets]
-	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
-	>=dev-qt/qtsql-5.7.1:5=[sqlite]
-	>=dev-qt/qtwidgets-5.7.1:5=
-	>=media-gfx/qrencode-3.4.4-r1:="
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch
-)
-
-DOCS=(
-	README.md
-	Example-client-configuration-file.ini
-	Example-contacts-file.txt
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# 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
-}
diff --git a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
index 00915580a10f..945996c436ae 100644
--- a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
-DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
+DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
 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"
@@ -45,7 +45,7 @@ src_configure() {
 		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
 		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -55,7 +55,7 @@ src_test() {
 
 src_install() {
 	local my_pn="openMittsu"
-	cmake-utils_src_install
+	cmake_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