From 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 May 2018 14:00:47 +0100 Subject: gentoo resync : 22.05.2018 --- app-crypt/gpgme/Manifest | 8 +- 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.10.0.ebuild | 2 +- app-crypt/gpgme/gpgme-1.8.0-r2.ebuild | 104 ------------------------- app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 107 -------------------------- 7 files changed, 2 insertions(+), 279 deletions(-) delete mode 100644 app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch delete mode 100644 app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch delete mode 100644 app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch delete mode 100644 app-crypt/gpgme/gpgme-1.8.0-r2.ebuild delete mode 100644 app-crypt/gpgme/gpgme-1.8.0-r3.ebuild (limited to 'app-crypt/gpgme') diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index e6f9ccabab11..484c44e04ea1 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,11 +1,5 @@ -AUX gpgme-1.1.8-et_EE.patch 347 BLAKE2B 88afa9629af3249337361e69496c3662ba7320229b50db697045174c58bee15e7cd0841125b646aa4a934d01a7a4ed309b902f70c67146c66100e2a66a24b5aa SHA512 69577d0a1ae9061277cd502d72c2add13b61def4990c09c6181a14b4792745a4e2e467090019ab1ed8d3dc6df6f09b63230d2d21974e0a802a1e976fe5de18d5 -AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450060dca31ffa10b00c53da0ce55405fc1eeb51ee6686f30f050337aaa3e978f1979cfe7151c5195d570f0a9432 SHA512 be2788db4a796fdd21524d20a8bc7ad52f7928fbd6e9945e5a2be048cc6251bf593a3d46623c589cbcd4491a3e5abdfc14b618098113c0e1ddcabdb4e7701f57 -AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7 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 -EBUILD gpgme-1.10.0.ebuild 2857 BLAKE2B 153897aea5d31a1455824d42fddf446765a767ddd361a99e74a95b4011a150eb8069a4c23000ac4926209b204ed69f1248006b6775f1ffac70d08a2631c28b50 SHA512 d5dd6cb588b55cdd1514e46b0f27823b67e5427dd754945c8491beae2cc77c19091be3024f520c18c3e89d6b2967676d3eb7b2e755909852e5727439af425f3d +EBUILD gpgme-1.10.0.ebuild 2856 BLAKE2B 91de73844ba2c16d354d10aa6e1172365dbbbeddec97efabbcaa66bba316c86d357d24b3f0db8f34bd423f4976f5be25fe0dffe08eb8f881e7aa4395fd4c101c SHA512 a77cd079ba24dc9967a90ccf5278bd4d5991b10df9823d4c6bc6e7eea6b40fbed1fb067d69576ac6fdd7b6d26b02f4f0311c07c4d5c736ad3a431166d3344ee9 EBUILD gpgme-1.11.1.ebuild 2865 BLAKE2B ce50ed82945b52ea38a271dd84be1fae4b6c32d21dbabd7ab8ba49ff414bfe5e7f53ceb97845935311597ec27f89efab8b224c9a8057dfdcfb4eb18bb36642bb SHA512 2f51d3246749375b0a202ff0d2514e6a9073ddb17bb59630208836062f55769106a695a0bd423ffdaff9303403706ebf05951f9cad221e46baef7214154df73e -EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244 -EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 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 293debb5b91d..000000000000 --- 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 09775b868eb6..000000000000 --- 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 -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 ---- - 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 9dd3e85cbfb7..000000000000 --- 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 -+#include /* 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 -+#include /* std::function */ - diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild index 4e11929a9ed0..c79592443168 100644 --- a/app-crypt/gpgme/gpgme-1.10.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild @@ -14,7 +14,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp static-libs cxx python qt5" COMMON_DEPEND=">=app-crypt/gnupg-2 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 ce9c2e52374d..000000000000 --- 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 c0b8989bec83..000000000000 --- 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? ( - ! /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 -} -- cgit v1.2.3