gentoo resync : 03.11.2019

4 files changed, 13 insertions, 81 deletions

diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 2c1ea26ac6f2..d743fc3ec6f2 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,8 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.30.1.tar.gz 5562456 BLAKE2B 104f4bd10edf4147d205fec69ec48eddf31150f898242819be25b83fa5f8ddcd51fd016aa2331b9b94fc8c60062745f0d06e5f0b4a30222c1cc44d54eccd6521 SHA512 463b549fbcdbdff3da51a0b781e7ff2c4ca33ebd22ff355b24f13db3c77b3f3fe38d3d97ff260829517d5d93c43b7d746ff58e3fca3d838f7e32de7066c5288a
-DIST moolticute-0.30.8.tar.gz 5587730 BLAKE2B a8ef141d7b8ed4d79a43652760626c4b608d7c92270a4d7f384bd240a5f90d6264d2714f3513acaa86f22135a1c885d6f713252ef69794e301a1b658aa1c47a3 SHA512 e5f848252d1deabfa8767284c2c34329a98f5849f8b2bdc62d454cc0e331d58fcd78e0845683931460c20be13d2f1baf3aee32a9f3244e769d5d4c222e182706
-EBUILD moolticute-0.30.1.ebuild 1238 BLAKE2B 096d598a023077e72c94bfe46340876bd0ef7a90a32c33dc78432c05bb5d07be44cde00dc32e264095b28c76d79b3176edc60aad0a79abefb92de546a08bf2a0 SHA512 cedbceb5b01d35e6d4f06f6fb9b1644750ea03c91b3dc0dd8bfb8e4fdaca1a822b2ff613c2d9f2beb704014e8c2c82e05e192eb66b30ddd95664b8394f50e46b
-EBUILD moolticute-0.30.8.ebuild 1242 BLAKE2B f52f229deb940d549f4ad402337a8a7b106ddc2127a03e4c606c468fae0bbfda3feef77240ba04ea64e874f68ffd6244f407ade3d35aecb64299c1be843f7713 SHA512 cdbbb1bd735ca5ed3af6b3153055a1f023776ee3b699c04d356c7f2b47e44172da67137644373da53d9a12acfe2471f3bcc217d14cc1b376648e5abae1649134
-EBUILD moolticute-9999.ebuild 1242 BLAKE2B f52f229deb940d549f4ad402337a8a7b106ddc2127a03e4c606c468fae0bbfda3feef77240ba04ea64e874f68ffd6244f407ade3d35aecb64299c1be843f7713 SHA512 cdbbb1bd735ca5ed3af6b3153055a1f023776ee3b699c04d356c7f2b47e44172da67137644373da53d9a12acfe2471f3bcc217d14cc1b376648e5abae1649134
+DIST moolticute-0.42.1.tar.gz 5647992 BLAKE2B 0e99e16d7c09320ca5a97cc7ed16f348245efccf9c1e4755f7e6ccfb66c293b878e200ffe5148c203fae300d41e9b44d9489d8e067cd39b475215393a991d6d5 SHA512 a5a9ade4d09711030c299fcb7ba42eb351d711a351caeb663d765e394860a45179a3f3852db4f2315082e759762f7bf66c888cba90cb520169dc869ce60b8a68
+EBUILD moolticute-0.42.1.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
+EBUILD moolticute-9999.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.30.1.ebuild b/app-crypt/moolticute/moolticute-0.30.1.ebuild
deleted file mode 100644
index 9aac00ed7170..000000000000
--- a/app-crypt/moolticute/moolticute-0.30.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-inherit gnome2-utils qmake-utils udev
-
-DESCRIPTION="Mooltipass crossplatform daemon/tools"
-HOMEPAGE="https://github.com/mooltipass/moolticute"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libusb-1.0.20
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	default
-
-	# Fill version.h with package version
-	if [[ ${PV} != 9999* ]]; then
-		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
-	fi
-}
-
-src_configure() {
-	eqmake5 PREFIX="/usr" Moolticute.pro
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	udev_dorules "${FILESDIR}/50-mooltipass.rule"
-	newinitd "${FILESDIR}/moolticuted.init" moolticuted
-}
-
-pkg_postinst() {
-	udev_reload
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-crypt/moolticute/moolticute-0.30.8.ebuild b/app-crypt/moolticute/moolticute-0.42.1.ebuild
index efd4c37a4de9..08512b4847b9 100644
--- a/app-crypt/moolticute/moolticute-0.30.8.ebuild
+++ b/app-crypt/moolticute/moolticute-0.42.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
-inherit gnome2-utils qmake-utils udev
+inherit xdg-utils qmake-utils udev
 
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
 HOMEPAGE="https://github.com/mooltipass/moolticute"
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
@@ -58,9 +58,9 @@ src_install() {
 
 pkg_postinst() {
 	udev_reload
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index efd4c37a4de9..08512b4847b9 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
-inherit gnome2-utils qmake-utils udev
+inherit xdg-utils qmake-utils udev
 
 DESCRIPTION="Mooltipass crossplatform daemon/tools"
 HOMEPAGE="https://github.com/mooltipass/moolticute"
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
@@ -58,9 +58,9 @@ src_install() {
 
 pkg_postinst() {
 	udev_reload
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }