From 768e32c7c9648a4d1a5151c55bcb3cea3bc887ac Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Mon, 4 Nov 2019 16:46:57 +0300 Subject: [PATCH] yubioath-desktop: fix errors while starting (https://github.com/pentoo/pentoo-overlay/issues/527) --- app-crypt/yubioath-desktop/metadata.xml | 8 +++ .../yubioath-desktop-5.0.1-r1.ebuild | 40 ----------- .../yubioath-desktop-5.0.1-r2.ebuild | 72 +++++++++++++++++++ .../yubioath-desktop-9999.ebuild | 72 +++++++++++++++++++ 4 files changed, 152 insertions(+), 40 deletions(-) create mode 100644 app-crypt/yubioath-desktop/metadata.xml delete mode 100644 app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r1.ebuild create mode 100644 app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r2.ebuild create mode 100644 app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild diff --git a/app-crypt/yubioath-desktop/metadata.xml b/app-crypt/yubioath-desktop/metadata.xml new file mode 100644 index 000000000..ebc718e70 --- /dev/null +++ b/app-crypt/yubioath-desktop/metadata.xml @@ -0,0 +1,8 @@ + + + + + email@linxon.ru + Yury Martynov + + diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r1.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r1.ebuild deleted file mode 100644 index ca34403b0..000000000 --- a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils eutils desktop - -DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" -HOMEPAGE="https://developers.yubico.com/yubioath-desktop/" -SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz" -KEYWORDS="~amd64" -SLOT=4 -LICENSE="BSD-2" - -RDEPEND=" - dev-qt/qtsingleapplication - dev-qt/qtquickcontrols2 - dev-python/pyotherside" -#to add: dev-python/binascii - -DEPEND="${RDEPEND} - >=app-crypt/yubikey-manager-0.5 - dev-qt/qtdeclarative:5" - -S="${WORKDIR}/${PN}-${P}" - -src_configure() { - eqmake5 yubioath-desktop.pro - python build_qrc.py resources.json -} - -src_install() { - emake install INSTALL_ROOT="${D}" - domenu resources/yubioath-desktop.desktop - doicon resources/icons/yubioath.png - - emake compiler_rcc_make_all - emake compiler_buildqrc_make_all - emake compiler_moc_header_make_all -} diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r2.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r2.ebuild new file mode 100644 index 000000000..fc7c49e1e --- /dev/null +++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.1-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) + +inherit eutils desktop python-single-r1 qmake-utils xdg-utils + +DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" +HOMEPAGE="https://developers.yubico.com/yubioath-desktop/ https://github.com/Yubico/yubioath-desktop" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Yubico/yubioath-desktop" +else + SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz" + + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-${P}" +fi + +SLOT=0 +LICENSE="BSD-2" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtdeclarative:5 + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + x11-libs/libdrm" + +RDEPEND="${DEPEND} + >=app-crypt/yubikey-manager-2.1.1[${PYTHON_USEDEP}] + dev-python/pyotherside[${PYTHON_USEDEP}] + dev-python/pycopy-binascii[${PYTHON_USEDEP}]" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + sed -i \ + -e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \ + $(qmake-utils_find_pro_file) || die + + python_fix_shebang "${S}" + default +} + +src_configure() { + eqmake5 $(qmake-utils_find_pro_file) +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + domenu resources/yubioath-desktop.desktop + doicon resources/icons/yubioath.png +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild new file mode 100644 index 000000000..fc7c49e1e --- /dev/null +++ b/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) + +inherit eutils desktop python-single-r1 qmake-utils xdg-utils + +DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO" +HOMEPAGE="https://developers.yubico.com/yubioath-desktop/ https://github.com/Yubico/yubioath-desktop" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Yubico/yubioath-desktop" +else + SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz" + + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-${P}" +fi + +SLOT=0 +LICENSE="BSD-2" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtdeclarative:5 + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + x11-libs/libdrm" + +RDEPEND="${DEPEND} + >=app-crypt/yubikey-manager-2.1.1[${PYTHON_USEDEP}] + dev-python/pyotherside[${PYTHON_USEDEP}] + dev-python/pycopy-binascii[${PYTHON_USEDEP}]" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + sed -i \ + -e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \ + $(qmake-utils_find_pro_file) || die + + python_fix_shebang "${S}" + default +} + +src_configure() { + eqmake5 $(qmake-utils_find_pro_file) +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + domenu resources/yubioath-desktop.desktop + doicon resources/icons/yubioath.png +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +}