From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-crypt/yubioath-desktop/Manifest | 3 +- .../yubioath-desktop-5.1.0-bin-installdir.patch | 22 +++++++++ .../yubioath-desktop-5.1.0-r1.ebuild | 54 +++++++++++++++++++++ .../yubioath-desktop/yubioath-desktop-5.1.0.ebuild | 56 ---------------------- 4 files changed, 78 insertions(+), 57 deletions(-) create mode 100644 app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch create mode 100644 app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild delete mode 100644 app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild (limited to 'app-crypt/yubioath-desktop') diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest index ddc71705b23a..287215c9ae74 100644 --- a/app-crypt/yubioath-desktop/Manifest +++ b/app-crypt/yubioath-desktop/Manifest @@ -1,5 +1,6 @@ +AUX yubioath-desktop-5.1.0-bin-installdir.patch 548 BLAKE2B 3ba3286ace20e64dd543f377631dcbc30e2e83c52a9e62954518ab06cbef1609d559092f49fefaa4f37316bab793511712e52817107d1e98b66843cd2cb88038 SHA512 d570d4484ea394413fa365a5a2e29a32a54adf703f83ca918ec0eef474adda9e95f7ab0048e2977f11066bd6884567e50c3787ddb1d3c356df6eeee8d9fafd17 DIST yubioath-desktop-5.0.5.tar.gz 5659179 BLAKE2B 31dd1a7e9b8a5034e916f38c7893572b6b7e75fa0bc45b5b807c89010ac0e4a01a446f03d1591dd6323a015fc8fb17861fa60dc5a5e4eff40b5261fb6e3f7088 SHA512 b5a0df306916896e1fd84d6a794a43365b0e0a2cecd97ec1dacc6312507dd2e4dd55fc12b0de9d72d1d0a1b40625330373b7c74dacb2ec37a24ea3e1fd2d4ff7 DIST yubioath-desktop-5.1.0.tar.gz 6322224 BLAKE2B e1fc93bd38af3c6937f390c738248e43dbd17052df5103a0e25547adf7b34eca60ed8b45c9681568202d01802a5d8503cf2a5bf53d57c7c18ee2ee53cecd8d51 SHA512 152e27fca3c082c996c96fb05ed66781a52a47f30d8c5649d43937cf87c566f09c1fcb6afd65402b5f7fbe2a1f71872f10c8b456bd8a9b240c360018defd48c9 EBUILD yubioath-desktop-5.0.5.ebuild 1292 BLAKE2B 8cfc49d3f1068ebc2c730ae1b2ea0c38a1272f3f81e361ea8c3fcd1b500988776f99a82e9bb9b91d5025f368a37001e3e498f90360d1d66d8d8dbda9acf1bb91 SHA512 ee8a4a17140221e486d85f392499f8f41ecdda7c9f0d747fa10d33cb8e51e9497f7caa632cdbd601a6e445e8886d960f586af7e6eff563671ceafb27607c4d5f -EBUILD yubioath-desktop-5.1.0.ebuild 1338 BLAKE2B 5ab32f86942969f53800512509a39a6cb6365a0977ed156f46968c9466cefb7eb17848a1be91164c20855a813225d30757376b969bc283414f9337528cb834ef SHA512 2108ce8fa01982c7199ca33c2668c313e4ee703d06f8c32fb6ecd5465ff5a8a6772c5921da8fc4aac11078271e19c522a156d746fa9404e47d6212c6cf3c0f73 +EBUILD yubioath-desktop-5.1.0-r1.ebuild 1295 BLAKE2B 96e64598fc30cefe50ba8ce721da8eadee5274fd243ad7c7dd2dddbc09b1d94ad8dd4173824ec82a30357bed2a17d7bea0fcd60df8697d31f73d9aa9080a518b SHA512 d713c1583008a9beff8cae8c2313a687db7a3b4f17a9b5795c61669912b0449a07ffa66a0335b73f8631c881087fa7bcfc41750c44eafc6313592d35120922de MISC metadata.xml 351 BLAKE2B ab6920491637edc42b25934202cf24529718ef72b907364a09939a6c73b2667872698da96534a624db98ac33bb9c7933413067c9eb0ff79563e289e73aa4587a SHA512 ce8b9a953eb1d0c88eb2b6dcc54a28e7e6df5ca3f9dada0619ea7d10ae4d2d5ac0717b7a0158331475c5e7cbeb576ed9ae177941892549be687c17340f3af88f diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch new file mode 100644 index 000000000000..749533ba31ba --- /dev/null +++ b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch @@ -0,0 +1,22 @@ +From 9ae1ef710d5b070e128597a0fad3bd4ffa94b0aa Mon Sep 17 00:00:00 2001 +From: Dennis Fokin +Date: Thu, 7 Oct 2021 10:18:33 +0200 +Subject: [PATCH] Set correct install path + +--- + yubioath-desktop.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/yubioath-desktop.pro b/yubioath-desktop.pro +index 551416ae..c0ef9bb1 100644 +--- a/yubioath-desktop.pro ++++ b/yubioath-desktop.pro +@@ -75,6 +75,8 @@ lupdate_only { + qml/slot/*.qml + } + ++# Set correct install path ++target.path = $$PREFIX/bin + + DISTFILES += \ + py/* \ diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild new file mode 100644 index 000000000000..c2f7b927166a --- /dev/null +++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit desktop python-single-r1 qmake-utils xdg + +DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" +HOMEPAGE=" + https://developers.yubico.com/yubioath-desktop/ + https://github.com/Yubico/yubioath-desktop" +SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtdeclarative:5 + dev-qt/qtmultimedia:5 + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + x11-libs/libdrm" +RDEPEND="${DEPEND} + $(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]') + dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]" + +PATCHES=( "${FILESDIR}"/${P}-bin-installdir.patch ) + +src_prepare() { + default + python_fix_shebang "${S}" +} + +src_configure() { + eqmake5 yubioath-desktop.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + domenu resources/com.yubico.yubioath.desktop + doicon resources/icons/com.yubico.yubioath.png + doicon -s scalable resources/icons/com.yubico.yubioath.svg +} diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild deleted file mode 100644 index e2f85896c574..000000000000 --- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" -HOMEPAGE=" - https://developers.yubico.com/yubioath-desktop/ - https://github.com/Yubico/yubioath-desktop" -SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtdeclarative:5 - dev-qt/qtmultimedia:5 - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - x11-libs/libdrm" -RDEPEND="${DEPEND} - $(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]') - dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]" - -src_prepare() { - default - sed -i \ - -e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \ - yubioath-desktop.pro || die - - python_fix_shebang "${S}" -} - -src_configure() { - eqmake5 yubioath-desktop.pro -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - domenu resources/com.yubico.yubioath.desktop - doicon resources/icons/com.yubico.yubioath.png - doicon -s scalable resources/icons/com.yubico.yubioath.svg -} -- cgit v1.2.3