commit: d957051d08922ad15c75910e630343a5c3906378 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Sun May 20 20:31:04 2018 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Sun May 20 20:31:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d957051d
app-crypt/gpgme: cleanup Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-crypt/gpgme/Manifest | 1 - app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch | 11 --- app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch | 33 -------- app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch | 16 ---- app-crypt/gpgme/gpgme-1.8.0-r2.ebuild | 104 ------------------------- app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 107 -------------------------- 6 files changed, 272 deletions(-) diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index ec409d46cfe..3ef61eb628f 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,3 +1,2 @@ DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a -DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch deleted file mode 100644 index 293debb5b91..00000000000 --- a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:25:48.000000000 +1100 -+++ gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100 -@@ -64,7 +64,7 @@ - while test $# -gt 0; do - case "$1" in - -*=*) -- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` -+ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'` - ;; - *) - optarg= diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch deleted file mode 100644 index 09775b868eb..00000000000 --- a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Wed, 16 Nov 2016 23:09:45 +0100 -Subject: [PATCH] Remove a forgotten instance of @libsuffix@ - -* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten -instance of @libsuffix@. --- - -b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from -cmake config files, but missed one instance. - -Signed-off-by: Heiko Becker <[email protected]> ---- - lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) - --- -2.8.0.rc3 - diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch deleted file mode 100644 index 9dd3e85cbfb..00000000000 --- a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp -index eb3af56..af47594 100644 ---- a/lang/qt/src/qgpgmenewcryptoconfig.cpp -+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp -@@ -51,2 +51,3 @@ - #include <cassert> -+#include <functional> /* std::mem_fn */ - -diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h -index 32b23db..c4f85c2 100644 ---- a/lang/qt/src/threadedjobmixin.h -+++ b/lang/qt/src/threadedjobmixin.h -@@ -53,2 +53,3 @@ - #include <cassert> -+#include <functional> /* std::function */ - diff --git a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild deleted file mode 100644 index ce9c2e52374..00000000000 --- a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 flag-o-matic ltprune qmake-utils - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme"; -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="1/11" # subslot = soname major version -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp static-libs cxx python qt5" - -COMMON_DEPEND=">=app-crypt/gnupg-2 - >=dev-libs/libassuan-2.0.2 - >=dev-libs/libgpg-error-1.17 - python? ( ${PYTHON_DEPS} ) - qt5? ( dev-qt/qtcore:5 )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${COMMON_DEPEND} - python? ( dev-lang/swig ) - qt5? ( dev-qt/qttest:5 )" -RDEPEND="${COMMON_DEPEND} - cxx? ( - !kde-apps/gpgmepp - !kde-apps/kdepimlibs:4 - )" - -REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.8-et_EE.patch - "${FILESDIR}"/${P}-cmake.patch -) - -do_python() { - if use python; then - pushd lang/python > /dev/null || die - distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null - fi -} - -src_prepare() { - default - do_python -} - -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 - - if [[ ${CHOST} == *-darwin* ]] ; then - # FIXME: I don't know how to select on C++11 (libc++) here, but - # I do know all Darwin users are using C++11. This should also - # apply to GCC 4.7+ with libc++, and basically anyone targetting - # it. - - # The C-standard doesn't define strdup, and C++11 drops it - # resulting in an implicit declaration of strdup error. Since - # it is in POSIX raise the feature set to that. - append-cxxflags -D_POSIX_C_SOURCE=200112L - - # Work around bug 601834 - use python && append-cflags -D_DARWIN_C_SOURCE - fi - - econf \ - --enable-languages="${languages[*]}" \ - $(use_enable static-libs static) - - use python && make -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_install() { - default - do_python - prune_libtool_files - - # 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.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild deleted file mode 100644 index c0b8989bec8..00000000000 --- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 flag-o-matic ltprune qmake-utils - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme"; -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="1/11" # subslot = soname major version -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp cxx python qt5 static-libs" - -COMMON_DEPEND=">=app-crypt/gnupg-2 - >=dev-libs/libassuan-2.0.2 - >=dev-libs/libgpg-error-1.17 - python? ( ${PYTHON_DEPS} ) - qt5? ( dev-qt/qtcore:5 )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${COMMON_DEPEND} - python? ( dev-lang/swig ) - qt5? ( dev-qt/qttest:5 )" -RDEPEND="${COMMON_DEPEND} - cxx? ( - !<kde-apps/gpgmepp-4.14.11_pre20160611:4 - !kde-apps/gpgmepp:5 - !<kde-apps/kdepimlibs-4.14.10_p20160611:4 - !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 - )" - -REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.8-et_EE.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-gcc-7.patch -) - -do_python() { - if use python; then - pushd lang/python > /dev/null || die - distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null - fi -} - -src_prepare() { - default - do_python -} - -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 - - if [[ ${CHOST} == *-darwin* ]] ; then - # FIXME: I don't know how to select on C++11 (libc++) here, but - # I do know all Darwin users are using C++11. This should also - # apply to GCC 4.7+ with libc++, and basically anyone targetting - # it. - - # The C-standard doesn't define strdup, and C++11 drops it - # resulting in an implicit declaration of strdup error. Since - # it is in POSIX raise the feature set to that. - append-cxxflags -D_POSIX_C_SOURCE=200112L - - # Work around bug 601834 - use python && append-cflags -D_DARWIN_C_SOURCE - fi - - econf \ - --enable-languages="${languages[*]}" \ - $(use_enable static-libs static) - - use python && make -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_install() { - default - do_python - prune_libtool_files - - # backward compatibility for gentoo - # in the past we had slots - dodir /usr/include/gpgme - dosym ../gpgme.h /usr/include/gpgme/gpgme.h -}
