diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest index cc367bfa8..a6dd737db 100644 --- a/app-crypt/yubioath-desktop/Manifest +++ b/app-crypt/yubioath-desktop/Manifest @@ -1,2 +1,2 @@ DIST yubioath-desktop-3.1.0.tar.gz 268909 SHA256 7caae0fd3b14529476eda3a5660bc050584b298ddc3c8d1adfe221041fa5db49 SHA512 47b2e4719eb37123230c1dd4b2694dd4a8079028bd77112edcd3a0a2fb2c269cba819622d195a7b4d2baad44504b29b691343f683b413d5c696efef0a7c24f97 WHIRLPOOL ddaea460653b90ac3f53886991f0a32c251145704b122b9ed0224fd6e3ae938ffc48598d59ca961e53b0e2461a905be3199ea92a78fce34ef61169f2e35df204 -DIST yubioath-desktop-4.2.0.tar.gz 316024 SHA256 c400264f9c9c826338ef6d2aa54235db9c306c5eb2ae58d8cab71c71ca145083 SHA512 50d877ddc10f2e38a913ea76543c2a94fe6427a2125e4ad12c9942a89212f9837ec75022623676df117c6c9f79ca2eaecfb27fb96a67c94b8fce46f9b0dd2f3e WHIRLPOOL 7dc83899636c3917925567b48d9bb801bbced739b57b90093b06bbacbaca5f21ee5a2f43e0c0aaa3afd8cf0b78fda6440efddaed33ac59d231f82ad820569fff +DIST yubioath-desktop-4.3.2.tar 1454080 SHA256 4119a89af48495498a62623404d663835555e0d24fe76409d949e40d4aa141e9 SHA512 3e50f92646e793b3dd8daf926589130919a35de6d73e8c8db4d34a30c6c433284953f202f27c64ee7fbd0c7281011401a59e896f844b9ad7e93867458b1e3e05 WHIRLPOOL 737833d9f4d95c00236cbfb59135044ad7a0b4631e8bfa842a86f348bde582fde84ff24b257c39ee080c99242309ed0cebbd9d396b2d3551e15cadeb9bdc979d diff --git a/app-crypt/yubioath-desktop/files/qtsingleapp.patch b/app-crypt/yubioath-desktop/files/4.3-qtsingleapp.patch similarity index 54% rename from app-crypt/yubioath-desktop/files/qtsingleapp.patch rename to app-crypt/yubioath-desktop/files/4.3-qtsingleapp.patch index ee6e02db5..d912ddc15 100644 --- a/app-crypt/yubioath-desktop/files/qtsingleapp.patch +++ b/app-crypt/yubioath-desktop/files/4.3-qtsingleapp.patch @@ -1,6 +1,6 @@ ---- a/yubioath-desktop.pro -+++ b/yubioath-desktop.pro -@@ -41,7 +41,7 @@ include(deployment.pri) +--- yubioath-desktop.pro.orig 2017-12-19 23:26:43.000000000 +0800 ++++ yubioath-desktop.pro 2018-02-03 11:05:38.162045402 +0800 +@@ -59,7 +59,7 @@ # Mac doesn't use qSingleApplication !macx { diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0-r1.ebuild similarity index 92% rename from app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild rename to app-crypt/yubioath-desktop/yubioath-desktop-3.1.0-r1.ebuild index ca2ff328e..486790795 100644 --- a/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0.ebuild +++ b/app-crypt/yubioath-desktop/yubioath-desktop-3.1.0-r1.ebuild @@ -5,8 +5,8 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" -SRC_URI="http://opensource.yubico.com/yubioath-desktop/releases/${P}.tar.gz" HOMEPAGE="http://opensource.yubico.com/yubioath-desktop" +SRC_URI="http://opensource.yubico.com/yubioath-desktop/releases/${P}.tar.gz" KEYWORDS="~amd64" SLOT="0" @@ -17,7 +17,7 @@ inherit distutils-r1 RDEPEND=">=app-crypt/ccid-1.4.25 dev-python/click dev-python/pyside - dev-python/pycrypto + || ( dev-python/pycryptodome dev-python/pycrypto ) dev-python/pyscard dev-python/pbkdf2 dev-python/pyusb" diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-4.2.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-4.3.2.ebuild similarity index 72% rename from app-crypt/yubioath-desktop/yubioath-desktop-4.2.0.ebuild rename to app-crypt/yubioath-desktop/yubioath-desktop-4.3.2.ebuild index 3db54823b..7a7363341 100644 --- a/app-crypt/yubioath-desktop/yubioath-desktop-4.2.0.ebuild +++ b/app-crypt/yubioath-desktop/yubioath-desktop-4.3.2.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 - inherit qmake-utils eutils DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" -#SRC_URI="http://opensource.yubico.com/yubioath-desktop/releases/${P}.tar.gz" -SRC_URI="https://github.com/Yubico/yubioath-desktop/releases/download/${P}/${P}.tar.gz" - HOMEPAGE="http://opensource.yubico.com/yubioath-desktop" +#https://github.com/Yubico/yubioath-desktop/issues/254 +SRC_URI="https://github.com/Yubico/yubioath-desktop/releases/download/${P}/${P}.tar.gz -> ${P}.tar" KEYWORDS="~amd64" SLOT="4" LICENSE="BSD-2" -USE="broken" RDEPEND="dev-qt/qtsingleapplication dev-python/pyotherside" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + >=app-crypt/yubikey-manager-0.5" -S="${WORKDIR}" +S="${WORKDIR}/${PN}" src_prepare() { - epatch ${FILESDIR}/qtsingleapp.patch + #https://github.com/Yubico/yubioath-desktop/pull/207 + epatch "${FILESDIR}/4.3-qtsingleapp.patch" eapply_user } diff --git a/profiles/pentoo/base/package.accept_keywords/app-crypt b/profiles/pentoo/base/package.accept_keywords/app-crypt index 3db34fe52..6c4c7b341 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-crypt +++ b/profiles/pentoo/base/package.accept_keywords/app-crypt @@ -1,9 +1,10 @@ ~app-crypt/acsccid-1.1.0 -=app-crypt/yubikey-manager-0.4* +=app-crypt/yubikey-manager-0.5* +=app-crypt/yubikey-manager-qt-0.4* #=app-crypt/yubioath-desktop-3* -=app-crypt/yubioath-desktop-4* +=app-crypt/yubioath-desktop-4.3* ~app-crypt/ccid-1.4.25 ~dev-python/pyotherside-1.5.3