[gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/

["Sam James" <sam@gentoo.org>]

commit:     1a9a4a206d078813dbae058425f27180f821373d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 21:11:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 21:12:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9a4a20

app-crypt/gpgme: depend on libgpg-error which installs gpg-error-config

which in turn ensures we provide gpgme-config. See bug for more details.

Closes: https://bugs.gentoo.org/699206
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gpgme/{gpgme-1.17.1-r1.ebuild => gpgme-1.17.1-r2.ebuild}      | 8 +++++++-
 .../gpgme/{gpgme-1.18.0-r1.ebuild => gpgme-1.18.0-r2.ebuild}      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
similarity index 93%
rename from app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
rename to app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
index 221743c8a6dd..574a602ef261 100644
--- a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild
@@ -29,10 +29,16 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 
-# Note: On each bump, update dep bounds on each version from configure.ac!
+# - On each bump, update dep bounds on each version from configure.ac!
+# - Quirky libgpg-error dep for bug #699206 (change in recent libgpg-error
+#   made gpgme stop installing gpgme-config)
 RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.36:=
+	|| (
+		>=dev-libs/libgpg-error-1.46-r1
+		<dev-libs/libgpg-error-1.46
+	)
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )

diff --git a/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
similarity index 93%
rename from app-crypt/gpgme/gpgme-1.18.0-r1.ebuild
rename to app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
index fe234fab1c35..bff9e90c35bd 100644
--- a/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild
@@ -31,10 +31,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 
-# Note: On each bump, update dep bounds on each version from configure.ac!
+# - On each bump, update dep bounds on each version from configure.ac!
+# - Quirky libgpg-error dep for bug #699206 (change in recent libgpg-error
+#   made gpgme stop installing gpgme-config)
 RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.36:=
+	|| (
+		>=dev-libs/libgpg-error-1.46-r1
+		<dev-libs/libgpg-error-1.46
+	)
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )