From c3c35bad74093f220d3119699223ee1133cf4f25 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 21 Jul 2019 19:34:18 +0200
Subject: app-crypt/yubikey-manager-qt: Fix missing PYTHON_{DEPS,REQUIRED_USE}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../yubikey-manager-qt-0.5.2.ebuild                |  3 +-
 .../yubikey-manager-qt-1.0.0-r3.ebuild             |  3 +-
 .../yubikey-manager-qt-1.1.0.ebuild                |  3 +-
 .../yubikey-manager-qt-1.1.1-r1.ebuild             | 57 ++++++++++++++++++++++
 .../yubikey-manager-qt-1.1.1.ebuild                | 56 ---------------------
 5 files changed, 63 insertions(+), 59 deletions(-)
 create mode 100644 app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
 delete mode 100644 app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild

(limited to 'app-crypt/yubikey-manager-qt')

diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
index d420feb341cc..e6b61d7f969e 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-0.8
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
index 3f3125b92317..0c586a4f439c 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-2.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
index 7c469b8c89a9..78abdfc9c1c8 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
 	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..360775f894b6
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+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"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	>=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/qtcore:5
+	dev-qt/qtdeclarative: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}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
deleted file mode 100644
index 7d4eb939e34c..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-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"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=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/qtcore:5
-	dev-qt/qtdeclarative: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}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
-- 
cgit v1.2.3-65-gdbad