gentoo resync : 17.02.2018

4 files changed, 3 insertions, 107 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 59437c8b2a0e..1cadabbe947c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 13a1a4e6ead7..d8267ec3c74f 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,8 +3,7 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 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.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2838 BLAKE2B 29dcfc5c52fd632fb812da7257d0d1395fd99558c666c554e4f2c20cccc771a9d8a50253e550c067ac403d9fe348b40cacdbcc4bcc223801f62f2be676046e05 SHA512 8ba983567f65d145ee3a65b622e3a35d10ed5f6d6ba43d607c087fe135fbe3d7c28812b402432617e92ae50c63c3301cb7c0a62a3654de0052e770cac160cb0b
+EBUILD gpgme-1.10.0.ebuild 2859 BLAKE2B 272e15bcd417c2abe19ff0f453118338295a1e3b0dd95c960eaecb327a90adba1e07a3c55dcc176fbd271b43df84ad26ffc2e7538bb9d0122fa179effa176661 SHA512 17f80ba78bd139285afe50eb492ce952e02a5c0bbc6ee0dc33cb08ac738e9b38377f14a0eca602d6a1dc4fefafbffde174f55f5b1358a36d362274a656f6f994
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
-EBUILD gpgme-9999.ebuild 2238 BLAKE2B afef415c3a730fc5ec3da76963a9c6a02adc2c49fd6629a49589fbc51513a288edafcb5d730f862c6147ca287d489b26190e4edbc4dbc3e29ad3c74dc7538a96 SHA512 a7c211d5b9cdddcb3d67e364e069f2d256aca238d7d1262af948859a3db50f0a300868113c721bf2796e696c5559a7089fbfc00e6096b5fc2686dac69c296e49
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index 43f3c5d077a8..d2d2386fafb0 100644
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs
+inherit distutils-r1 flag-o-matic libtool ltprune 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"
@@ -86,6 +86,7 @@ src_configure() {
 
 src_compile() {
 	default
+	elibtoolize
 	do_python
 }
 
diff --git a/app-crypt/gpgme/gpgme-9999.ebuild b/app-crypt/gpgme/gpgme-9999.ebuild
deleted file mode 100644
index e9ff4a13a87d..000000000000
--- a/app-crypt/gpgme/gpgme-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 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 toolchain-funcs
-inherit git-r3 autotools
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-EGIT_REPO_URI="git://git.gnupg.org/gpgme.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS=""
-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-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} )"
-
-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
-	fi
-}
-
-pkg_setup() {
-	addpredict /run/user/$(id -u)/gnupg
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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
-
-	econf \
-		--enable-languages="${languages[*]}" \
-		$(use_enable static-libs static)
-
-	use python && make -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	default
-	if use python; then
-		test_python() {
-			emake -C lang/python/tests check \
-				PYTHON=${EPYTHON} \
-				PYTHONS=${EPYTHON} \
-				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-		}
-		python_foreach_impl test_python
-	fi
-}
-
-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
-}