commit:     2ccb8a744898d5e3b48acfb1c6cb802778ed087b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 23:36:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 23:38:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccb8a74

app-crypt/gpgme: fix VariableScope, UnusedInherits

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/gpgme/gpgme-1.17.1.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-crypt/gpgme/gpgme-1.17.1.ebuild 
b/app-crypt/gpgme/gpgme-1.17.1.ebuild
index 6a7c3abc4e5a..d2c8788dbb3a 100644
--- a/app-crypt/gpgme/gpgme-1.17.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+inherit distutils-r1 libtool qmake-utils toolchain-funcs
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme";
@@ -41,7 +41,12 @@ do_python() {
        fi
 }
 
-pkg_setup() {
+src_prepare() {
+       default
+
+       elibtoolize
+
+       # bug #697456
        addpredict /run/user/$(id -u)/gnupg
 
        local MAX_WORKDIR=66
@@ -49,11 +54,6 @@ pkg_setup() {
                ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than 
${MAX_WORKDIR} which will fail tests"
                SKIP_TESTS=1
        fi
-}
-
-src_prepare() {
-       default
-       elibtoolize
 
        # Make best effort to allow longer PORTAGE_TMPDIR
        # as usock limitation fails build/tests

Reply via email to