From 1a9a4a206d078813dbae058425f27180f821373d Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 9 Oct 2022 22:11:56 +0100 Subject: 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 --- app-crypt/gpgme/gpgme-1.17.1-r1.ebuild | 132 ------------------------------ app-crypt/gpgme/gpgme-1.17.1-r2.ebuild | 138 ++++++++++++++++++++++++++++++++ app-crypt/gpgme/gpgme-1.18.0-r1.ebuild | 136 ------------------------------- app-crypt/gpgme/gpgme-1.18.0-r2.ebuild | 142 +++++++++++++++++++++++++++++++++ 4 files changed, 280 insertions(+), 268 deletions(-) delete mode 100644 app-crypt/gpgme/gpgme-1.17.1-r1.ebuild create mode 100644 app-crypt/gpgme/gpgme-1.17.1-r2.ebuild delete mode 100644 app-crypt/gpgme/gpgme-1.18.0-r1.ebuild create mode 100644 app-crypt/gpgme/gpgme-1.18.0-r2.ebuild (limited to 'app-crypt') diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild deleted file mode 100644 index 221743c8a6dd..000000000000 --- a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should: -# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ -# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 -# (find the one for the current release then subscribe to it + -# any subsequent ones linked within so you're covered for a while.) - -PYTHON_COMPAT=( python3_{8..11} ) -DISTUTILS_OPTIONAL=1 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc - -inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="https://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2 - verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )" - -LICENSE="GPL-2 LGPL-2.1" -# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355 -# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff. -# Subslot: SONAME of each: -SLOT="1/11.6.15" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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! -RDEPEND=">=app-crypt/gnupg-2 - >=dev-libs/libassuan-2.5.3:= - >=dev-libs/libgpg-error-1.36:= - python? ( ${PYTHON_DEPS} ) - qt5? ( dev-qt/qtcore:5 )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${RDEPEND} - test? ( - qt5? ( dev-qt/qttest:5 ) - )" -BDEPEND="python? ( dev-lang/swig ) - verify-sig? ( sec-keys/openpgp-keys-gnupg )" - -REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" - -do_python() { - if use python; then - pushd "lang/python" > /dev/null || die - top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null || die - fi -} - -src_prepare() { - default - - elibtoolize - - # bug #697456 - addpredict /run/user/$(id -u)/gnupg - - local MAX_WORKDIR=66 - if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then - eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!" - die "Could not run tests as requested with too-long WORKDIR." - fi - - # Make best effort to allow longer PORTAGE_TMPDIR - # as usock limitation fails build/tests - ln -s "${P}" "${WORKDIR}/b" || die - S="${WORKDIR}/b" -} - -src_configure() { - local languages=() - - use common-lisp && languages+=( "cl" ) - use cxx && languages+=( "cpp" ) - if use qt5; then - languages+=( "qt" ) - #use doc || - export DOXYGEN=true - export MOC="$(qt5_get_bindir)/moc" - fi - - # bug #847955 - append-lfs-flags - - # bug #811933 for libassuan prefix - econf \ - $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \ - --enable-languages="${languages[*]}" \ - --with-libassuan-prefix="${ESYSROOT}"/usr \ - $(use_enable static-libs static) - - use python && emake -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_test() { - default - - use python && distutils-r1_src_test -} - -python_test() { - emake -C lang/python/tests check \ - PYTHON=${EPYTHON} \ - PYTHONS=${EPYTHON} \ - TESTFLAGS="--python-libdir=${BUILD_DIR}/lib" -} - -src_install() { - default - - do_python - - find "${ED}" -type f -name '*.la' -delete || die - - # Backward compatibility for gentoo - # (in the past, we had slots) - dodir /usr/include/gpgme - dosym ../gpgme.h /usr/include/gpgme/gpgme.h -} diff --git a/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild new file mode 100644 index 000000000000..574a602ef261 --- /dev/null +++ b/app-crypt/gpgme/gpgme-1.17.1-r2.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should: +# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ +# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 +# (find the one for the current release then subscribe to it + +# any subsequent ones linked within so you're covered for a while.) + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_OPTIONAL=1 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc + +inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig + +DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" +HOMEPAGE="https://www.gnupg.org/related_software/gpgme" +SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2 + verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )" + +LICENSE="GPL-2 LGPL-2.1" +# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355 +# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff. +# Subslot: SONAME of each: +SLOT="1/11.6.15" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp static-libs +cxx python qt5 test" +RESTRICT="!test? ( test )" + +# - 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/null || die + top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE} + popd > /dev/null || die + fi +} + +src_prepare() { + default + + elibtoolize + + # bug #697456 + addpredict /run/user/$(id -u)/gnupg + + local MAX_WORKDIR=66 + if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then + eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!" + die "Could not run tests as requested with too-long WORKDIR." + fi + + # Make best effort to allow longer PORTAGE_TMPDIR + # as usock limitation fails build/tests + ln -s "${P}" "${WORKDIR}/b" || die + S="${WORKDIR}/b" +} + +src_configure() { + local languages=() + + use common-lisp && languages+=( "cl" ) + use cxx && languages+=( "cpp" ) + if use qt5; then + languages+=( "qt" ) + #use doc || + export DOXYGEN=true + export MOC="$(qt5_get_bindir)/moc" + fi + + # bug #847955 + append-lfs-flags + + # bug #811933 for libassuan prefix + econf \ + $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \ + --enable-languages="${languages[*]}" \ + --with-libassuan-prefix="${ESYSROOT}"/usr \ + $(use_enable static-libs static) + + use python && emake -C lang/python prepare + + do_python +} + +src_compile() { + default + do_python +} + +src_test() { + default + + use python && distutils-r1_src_test +} + +python_test() { + emake -C lang/python/tests check \ + PYTHON=${EPYTHON} \ + PYTHONS=${EPYTHON} \ + TESTFLAGS="--python-libdir=${BUILD_DIR}/lib" +} + +src_install() { + default + + do_python + + find "${ED}" -type f -name '*.la' -delete || die + + # Backward compatibility for gentoo + # (in the past, we had slots) + dodir /usr/include/gpgme + dosym ../gpgme.h /usr/include/gpgme/gpgme.h +} diff --git a/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild deleted file mode 100644 index fe234fab1c35..000000000000 --- a/app-crypt/gpgme/gpgme-1.18.0-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should: -# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ -# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 -# (find the one for the current release then subscribe to it + -# any subsequent ones linked within so you're covered for a while.) - -PYTHON_COMPAT=( python3_{8..11} ) -DISTUTILS_OPTIONAL=1 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc - -inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="https://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2 - verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )" - -LICENSE="GPL-2 LGPL-2.1" -# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355 -# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff. -# Subslot: SONAME of each: -# Bump FUDGE if a release is made which breaks ABI without changing SONAME. -# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.) -SLOT="1/11.6.15.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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! -RDEPEND=">=app-crypt/gnupg-2 - >=dev-libs/libassuan-2.5.3:= - >=dev-libs/libgpg-error-1.36:= - python? ( ${PYTHON_DEPS} ) - qt5? ( dev-qt/qtcore:5 )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${RDEPEND} - test? ( - qt5? ( dev-qt/qttest:5 ) - )" -BDEPEND="python? ( dev-lang/swig ) - verify-sig? ( sec-keys/openpgp-keys-gnupg )" - -REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch -) - -do_python() { - if use python; then - pushd "lang/python" > /dev/null || die - top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null || die - fi -} - -src_prepare() { - default - - elibtoolize - - # bug #697456 - addpredict /run/user/$(id -u)/gnupg - - local MAX_WORKDIR=66 - if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then - eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!" - die "Could not run tests as requested with too-long WORKDIR." - fi - - # Make best effort to allow longer PORTAGE_TMPDIR - # as usock limitation fails build/tests - ln -s "${P}" "${WORKDIR}/b" || die - S="${WORKDIR}/b" -} - -src_configure() { - local languages=() - - use common-lisp && languages+=( "cl" ) - use cxx && languages+=( "cpp" ) - if use qt5; then - languages+=( "qt" ) - #use doc || - export DOXYGEN=true - export MOC="$(qt5_get_bindir)/moc" - fi - - # bug #847955 - append-lfs-flags - - econf \ - $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \ - --enable-languages="${languages[*]}" \ - $(use_enable static-libs static) - - use python && emake -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_test() { - default - - use python && distutils-r1_src_test -} - -python_test() { - emake -C lang/python/tests check \ - PYTHON=${EPYTHON} \ - PYTHONS=${EPYTHON} \ - TESTFLAGS="--python-libdir=${BUILD_DIR}/lib" -} - -src_install() { - default - - do_python - - find "${ED}" -type f -name '*.la' -delete || die - - # Backward compatibility for gentoo - # (in the past, we had slots) - dodir /usr/include/gpgme - dosym ../gpgme.h /usr/include/gpgme/gpgme.h -} diff --git a/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild new file mode 100644 index 000000000000..bff9e90c35bd --- /dev/null +++ b/app-crypt/gpgme/gpgme-1.18.0-r2.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should: +# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ +# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 +# (find the one for the current release then subscribe to it + +# any subsequent ones linked within so you're covered for a while.) + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_OPTIONAL=1 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc + +inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig + +DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" +HOMEPAGE="https://www.gnupg.org/related_software/gpgme" +SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2 + verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )" + +LICENSE="GPL-2 LGPL-2.1" +# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355 +# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff. +# Subslot: SONAME of each: +# Bump FUDGE if a release is made which breaks ABI without changing SONAME. +# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.) +SLOT="1/11.6.15.1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp static-libs +cxx python qt5 test" +RESTRICT="!test? ( test )" + +# - 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/null || die + top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE} + popd > /dev/null || die + fi +} + +src_prepare() { + default + + elibtoolize + + # bug #697456 + addpredict /run/user/$(id -u)/gnupg + + local MAX_WORKDIR=66 + if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then + eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!" + die "Could not run tests as requested with too-long WORKDIR." + fi + + # Make best effort to allow longer PORTAGE_TMPDIR + # as usock limitation fails build/tests + ln -s "${P}" "${WORKDIR}/b" || die + S="${WORKDIR}/b" +} + +src_configure() { + local languages=() + + use common-lisp && languages+=( "cl" ) + use cxx && languages+=( "cpp" ) + if use qt5; then + languages+=( "qt" ) + #use doc || + export DOXYGEN=true + export MOC="$(qt5_get_bindir)/moc" + fi + + # bug #847955 + append-lfs-flags + + econf \ + $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \ + --enable-languages="${languages[*]}" \ + $(use_enable static-libs static) + + use python && emake -C lang/python prepare + + do_python +} + +src_compile() { + default + do_python +} + +src_test() { + default + + use python && distutils-r1_src_test +} + +python_test() { + emake -C lang/python/tests check \ + PYTHON=${EPYTHON} \ + PYTHONS=${EPYTHON} \ + TESTFLAGS="--python-libdir=${BUILD_DIR}/lib" +} + +src_install() { + default + + do_python + + find "${ED}" -type f -name '*.la' -delete || die + + # Backward compatibility for gentoo + # (in the past, we had slots) + dodir /usr/include/gpgme + dosym ../gpgme.h /usr/include/gpgme/gpgme.h +} -- cgit v1.2.3-65-gdbad