gentoo resync : 10.02.2019

4 files changed, 17 insertions, 61 deletions

diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 5b3ee4217989..0e5e75b8d810 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,9 +1,7 @@
-DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
-DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
 DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
 DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
-EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
-EBUILD yubikey-manager-qt-0.5.1.ebuild 1445 BLAKE2B b11dd07d657c4e61f284d733ddcc71a3a2a0860a39b0a8d6ae9f3895cda38922dacb3816cd4464c91664f456e8edaf2b06175a07b1c8ad0d68cc2a616f00c881 SHA512 6beafa82aa84056534d0a99dac7438da46f7d9fd3328b220c39fed6da7da6c24239c8d2e68c48a994d6b691d4fc7ea832fae953243b6138df078ae16e0d226d2
+DIST yubikey-manager-qt-1.1.0.tar.gz 10893455 BLAKE2B d83f76b83f35380377beb0e5c5b4a605049211685ff3ec44f60c909f8bc8f60dcd0868ad666bebce13e7c0459f604dd5d77cb1bd01035fe8584c019aacca39e8 SHA512 b54f1e6908b190ccb9273b906ace9ce2e1d189b794ba9b0ae00dbda4808b3f376b37c5f010ae06eaa63515af9b48698499f87780c59394f8b80f35d64d599c59
 EBUILD yubikey-manager-qt-0.5.2.ebuild 1410 BLAKE2B 7da065e45b89bc70d7e3a577f9312bd6a955ad071fbc066c7401773fa9defe49aed871c3e4db7b6931309eff67a5a470014459a09c78568c159a582b9ae85d6c SHA512 d18d8da49e4080a2f84ac3ea1c800002d40eae7a584f35a430f3571a65b1e792b4e0f9275065dd392332d94998cd59c50183bf25bcfa310c3340adbb584c2376
-EBUILD yubikey-manager-qt-1.0.0-r2.ebuild 1426 BLAKE2B 9efa68f825fc6632b77803d50f5c620d53acf7e7362909571d89ad5a16bcfccd7dfaa68e77c032cd0145eaed2e2ab33cde4eb53baeca4808597d1349f0d21098 SHA512 54d6f4ae81cc13e844d48470a93e267b40158f85a8c6e6d621d7551e718d87cb83db1391ffd0ef1fcd1995f02a7cfb90617b2dec491c77771ebff55470f251f9
+EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1478 BLAKE2B d2b6273e43c6e0361700f0eacd838ab4c46b8d7db99d368787d06b7bf43dd07841d33fcc27b4a19b07990b89d7c74c7647ac64e596110f9c33fe18fc463b75e5 SHA512 c16c40c10d98c491214dfe46678b08488041a3a26d8e155edc4749a8c66d36d4e3f84bbe693e858c10eee676c6b98c0789520de75e306d0827d1a0ca61adab4a
+EBUILD yubikey-manager-qt-1.1.0.ebuild 1369 BLAKE2B fe38abf93e1d1b2ff89714bc7d207631ed547332ff1d9d19ea748d4d91cfbf09066355491c19115a11e536823fdcc05b53e1815f755af6845262d5497f1560cc SHA512 8c921e8773daa11054c69427d4a52660c5925cc02051d611afdd460d77585be06c0b366935297d38e997b87887fc70b26f53ab61ce8d6de215926ac1393b9aca
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
deleted file mode 100644
index dbd42b543c6d..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils qmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=app-crypt/yubikey-manager-0.5.0[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtdeclarative:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	rm -rf vendor ykman-gui/vendor || die
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-	echo "${PV}" > VERSION || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-}
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
index 08961842de99..c2fe40e47628 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 
 DEPEND="
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-2.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
 	dev-qt/qtsingleapplication[qt5(+),X]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
index b9627b57544b..54eda43c3b07 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,33 +9,35 @@ inherit eutils qmake-utils python-single-r1
 
 DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-# >yubikey-manager-qt-0.5.1 should have the tarball issue fixed: https://github.com/Yubico/yubikey-manager-qt/issues/49
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz -> ${P}.tar"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-0.8
+	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
 	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {
 	default
 
 	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
 		-i ykman-gui/ykman-gui.pro || die
 }