gentoo Easter resync : 12.04.2020

4 files changed, 14 insertions, 35 deletions

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 6fa1c32708dd..4cbd2546e5e7 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
-EBUILD gpgme-1.13.0-r1.ebuild 2878 BLAKE2B 2da91bd9d625f1165df0abfad33810e1b007a029e7b48d491d72986cbe4971d3e7c0ae8bfabfb203a0c284e39c8327d3dba4a6dee8f954ebdb0d8d5ef7b21b9f SHA512 94548fcefc1d5828385b7efdaf611f39598750077c0f4858f1c562fe76a17b65735344b16612dddae0fdea79bf09274d80c5b4af84ae0617178b9aab4b7b7819
-EBUILD gpgme-1.13.0.ebuild 2869 BLAKE2B c1d9063718585de62adbc334c9da2184e5b546f41e61dda7e22f5c966aea7f9229507853952c28a6af9e8ce2b9895954f8f3a7eea4c0d8523af3ddddefb4c379 SHA512 ec8fafe2070633be382cff3d09393b87b3a15fe018e58961d6525eaeedb98ddc94ba374d157c9e8e4a87cbf09e80c0b65148ccb271a89e36de5f017e91756576
-EBUILD gpgme-1.13.1.ebuild 2878 BLAKE2B 4023fe243cf0df209c1a408e7f635a06cf30c4e0e96f19b8f797a4c5aa899fe301bd97c264fe1a0f009934faf9f3bec29a25c5d88b9c7601a35c9c538cddb2bf SHA512 c442573cbbbd40906634f1a736e04837c3a3cb19e957808b68ba5ae4998f42c0e3ed4d3cd61ab8af2ef96fbf23af85cfc263ed604c89246cd6568e617d9be322
+EBUILD gpgme-1.13.0-r1.ebuild 2671 BLAKE2B 847b922272a880fb192d9573f70e51e576b04ca106ca6d2d2ddc17dfc62986b8735be9c43d3133f27e3bf45ce4ae38082bfc713c941c4989368a15288458a73f SHA512 c43038ae65064cd0732e16be1a5cde5aa7f5379bcc3c7bea41ce217612260c1cb936e073a92ffa620d8aa658cdb5616ca67bb4ce28a8b573f5920a79aef612b4
+EBUILD gpgme-1.13.0.ebuild 2665 BLAKE2B 53568bff7ddc1b082c34b1b90c1d1c5a08bcffd6be53576e7d42dc15c5acd9c8284a48308f194b9b39889a2d8cd5787c04ce34d93a07a73f7d3bce46120c20a8 SHA512 5c0ec36e716642576e161482404b39e02006f193c40e739ef336555ea18caef99325c461943615bdab8166fedce2757c671032efc8181e5c0081ee39091df250
+EBUILD gpgme-1.13.1.ebuild 2673 BLAKE2B e64826465153cc45763b92b1cc3c14722a1e6b482ef6ce9836ab8d9a61bd647dbd0134cba1336f0878dc7fab96275004a9d19f11fa5360b93a3f6184be72a09e SHA512 550752badc923cc321b6efd81b21320070a9333275e3b6cb00bb206bfe5cb44128172805d6692eb4e68fcf1945907e87e68ec02e599ad94ca31cf1f20bc874be
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index ab42a52d09e9..124db5b26b6b 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -14,24 +14,17 @@ 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 ~riscv s390 sh sparc x86 ~x64-cygwin ~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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	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
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index 6166bcaf0672..4f9a829ea5eb 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -14,24 +14,17 @@ 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 ~riscv sparc x86 ~x64-cygwin ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~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
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.0.2:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	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
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index 1f2c818fb516..18f3e6fe6efe 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -15,23 +15,16 @@ 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 ~riscv ~sparc ~x86 ~x64-cygwin ~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"
+IUSE="common-lisp static-libs +cxx python qt5"
 
-COMMON_DEPEND=">=app-crypt/gnupg-2
+RDEPEND=">=app-crypt/gnupg-2
 	>=dev-libs/libassuan-2.5.3:=
 	>=dev-libs/libgpg-error-1.29:=
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtcore:5 )"
 	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	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
-	)"
 BDEPEND="python? ( dev-lang/swig )"
 
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"