gentoo resync : 15.12.2017

5 files changed, 11 insertions, 30 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index ded429cd81ee..5c9b4b2b6000 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,10 +2,10 @@ AUX gpgme-1.1.8-et_EE.patch 347 BLAKE2B 88afa9629af3249337361e69496c3662ba732022
 AUX gpgme-1.10.0_beta81-build.patch 817 BLAKE2B de479a5592a470fa308e9e640bf7c88815eec8caa202e6f02cdda34b750081ef73bd1c7bc1764451ad91d48d73f1fbd5a9c7d40db11ae90093b49ad282f23d71 SHA512 633d18fda3a81a3b7592887455bac5ced37cdcb7951e7ad43dde7e4b809395fefc1eae168b49ade53862a92c07c198046602b6a56bbcacaf762b3f3e8d779983
 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-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b
+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_beta81.ebuild 3176 BLAKE2B d67d0cab23284582395df73d37011ca452a2e90fe199706e0711ea4f50a54ce149908b794c4f3aa6308f148d820642f63feb15d6ac21dc6f8d1213f6dfdc953c SHA512 85275578dd563f69d2353652a5d4767b26cefbc8b39109c0e1e4d6f9a4413c36dea4e5ab73a377d1018e4685f2edb178ec891035a2e70495d6d4efa18ef04bb6
-EBUILD gpgme-1.8.0-r2.ebuild 2526 BLAKE2B b703d96c5cb1b55cffa7c72ba158c0e695c1e6a9d63e8801e1a5a2a5266c704c9f9441d8fa996402539ed855e755c1a1f4bab9ba23e5b652893c5ff80b39d3f9 SHA512 bb3849e3f0e2de7326c9f9c49114c0ad98827e8d72c3aad7d22e8ced2e65bb505ce79c437808e1b38e0c2d02bb2b26363557be6eb5898d062afedc87e1770a46
-EBUILD gpgme-1.8.0-r3.ebuild 2678 BLAKE2B b1eb1e842c13b4d45f641ba275bd6b129ce33d1d56cf8c9b5ad15fca1789e0c9b540ff797e5dfc6c158a9c1a4fd1db41debcdfed740be957a7f438a91d5e5c64 SHA512 3b201fbf0d78b94091bee410d12b599c1fc51ff9ca674437bb7dfbcc1bf97084002a02e05b26dd6e48b53483f78b8e2009a01fdaabea4312a4eb1062b8999d72
-EBUILD gpgme-9999.ebuild 2783 BLAKE2B aa4bcaf208df25e4a3dc4256804b02d2aa3dd1180fd4749bf79a5a16c699f3b80b11f662b61a9db76a58f3bd64696a0f6a5f51847d18bb5584f3b73b8a50ac57 SHA512 8a100c6a5760d652fca76f58725599dbdeca8202701435f519c44ab88cd4e2b97685aa9798f21e6449b8bc3a3986df9c113645c5d86d3c382bbb9a7585afaa86
+EBUILD gpgme-1.10.0.ebuild 2896 BLAKE2B 928f564c16664e75db1f4b8689e2069ca83079c8a56f923b43a5fb09cfdd07c8108deca8b32c6123a0089e0df6c97217a4a6bdaa7c9ed94df99796f2501fc0a6 SHA512 a462c1acb84a7be033c23c29726e68127ec2b4ff36ffafec743592a5812fc6ddbae23d1e97a74f453718a90c4781c78fbe5774df25d751d4894edbb92e5f1ede
+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 2787 BLAKE2B 264fdf2cc60ed4a87bf1ed7897a24b56e16a16729d96c00922fb48a2413e899209154d4587698436c3000ce1b575b590d5d5ad2215fe3d2808367e1629424c7a SHA512 a70e660dfc2740c339a6d28875bb85c58438d384adb439c779884ae3e1446042e8e59918f44fdc0a55be57b66848ca64532298d9d560069c7319506664191477
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index a17a8fa16028..7b59b4d96fee 100644
--- a/app-crypt/gpgme/gpgme-1.10.0_beta81.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -6,21 +6,18 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools distutils-r1 flag-o-matic ltprune qmake-utils toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 flag-o-matic 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"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+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
+COMMON_DEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2:=
 	>=dev-libs/libgpg-error-1.17:=
 	python? ( ${PYTHON_DEPS} )
@@ -39,12 +36,6 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die
@@ -57,16 +48,6 @@ pkg_setup() {
 	addpredict /run/user/$(id -u)/gnupg
 }
 
-src_prepare() {
-	default
-	eautoreconf
-
-	# Socket name is too long if we use full beta name
-	# tests are failing
-	ln -s "${MY_P}" "${WORKDIR}/b"
-	S="${WORKDIR}/b"
-}
-
 src_configure() {
 	local languages=()
 	use common-lisp && languages+=( "cl" )
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
index ff2d22ee82e3..ce9c2e52374d 100644
--- a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
@@ -17,7 +17,7 @@ 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
+COMMON_DEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2
 	>=dev-libs/libgpg-error-1.17
 	python? ( ${PYTHON_DEPS} )
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
index c18cb6e64d68..c0b8989bec83 100644
--- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
@@ -17,7 +17,7 @@ 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
+COMMON_DEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2
 	>=dev-libs/libgpg-error-1.17
 	python? ( ${PYTHON_DEPS} )
diff --git a/app-crypt/gpgme/gpgme-9999.ebuild b/app-crypt/gpgme/gpgme-9999.ebuild
index 62097f8115df..134a3e18cd19 100644
--- a/app-crypt/gpgme/gpgme-9999.ebuild
+++ b/app-crypt/gpgme/gpgme-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="1/11" # subslot = soname major version
 KEYWORDS=""
 IUSE="common-lisp static-libs cxx python qt5"
 
-COMMON_DEPEND="app-crypt/gnupg
+COMMON_DEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2:=
 	>=dev-libs/libgpg-error-1.17:=
 	python? ( ${PYTHON_DEPS} )