commit:     1d3ad4049aed14eda7c68d25760084b5b72a052b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 15:59:08 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 15:59:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3ad404

app-crypt/yubikey-manager: make app-crypt/ccid unconditional

Bug: https://bugs.gentoo.org/728704
Bug: https://bugs.gentoo.org/779427
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...ager-4.0.5.ebuild => yubikey-manager-4.0.5-r1.ebuild} | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.5.ebuild 
b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
similarity index 79%
rename from app-crypt/yubikey-manager/yubikey-manager-4.0.5.ebuild
rename to app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
index b5099ff320d..260ec24a756 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.5.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
-inherit distutils-r1 optfeature
+inherit distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager/";
@@ -19,20 +19,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="test" # Tests require non-existing package makefun
 
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
 RDEPEND="
+       app-crypt/ccid
        dev-python/click[${PYTHON_USEDEP}]
        dev-python/cryptography[${PYTHON_USEDEP}]
        dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
        dev-python/pyscard[${PYTHON_USEDEP}]"
 
 python_install_all() {
        distutils-r1_python_install_all
        doman man/ykman.1
 }
-
-pkg_postinst() {
-       optfeature "'ykman oath'" app-crypt/ccid
-       optfeature "'ykman openpgp'" app-crypt/ccid
-       optfeature "'ykman piv'" app-crypt/ccid
-}

Reply via email to