Revbump and remove old. Drop caps use flag and disable capabilities due to various applications requiring privileges after libgcrypt drops them (bug #468616) and use the autotools-utils eclass.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 44 insertions, 39 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 522911e08c7f..8741c56adf84 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.169 2013/04/27 22:40:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.170 2013/06/04 21:55:51 radhermit Exp $
+
+*libgcrypt-1.5.2-r1 (04 Jun 2013)
+
+  04 Jun 2013; Tim Harder <radhermit@gentoo.org> -libgcrypt-1.5.2.ebuild,
+  +libgcrypt-1.5.2-r1.ebuild:
+  Revbump and remove old. Drop caps use flag and disable capabilities due to
+  various applications requiring privileges after libgcrypt drops them (bug
+  #468616) and use the autotools-utils eclass.
 
 *libgcrypt-1.5.2 (27 Apr 2013)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index ca0d37b822e5..41b797c08706 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -18,17 +18,17 @@ EBUILD libgcrypt-1.5.0-r3.ebuild 1566 SHA256 16d8b1a33c00630c42d92ba3ea599081b84
 EBUILD libgcrypt-1.5.0-r4.ebuild 1719 SHA256 52c051ff384cb1cac57d0e9e9ccd7d5a92fb25e118ce91238b9383e32c0c5cd9 SHA512 5c3e89db7d10c3bd7f65c0ce4d1450760936930043cdb94b2c3ee33feacfcaa48509b6affba62645b50a4df91fc8de9ed27050be57ef7a26d6c0e6fe0aea9ef5 WHIRLPOOL f15f9127d2306d31e105621ebfd0745cf8e211acb8c36daaf40f22f42a84d04cc7643d1c82a6f1df5b942305c748bf230579a9d7ae5a5d9f9b121b1180058b7c
 EBUILD libgcrypt-1.5.0.ebuild 1152 SHA256 e6aa83ade326e53949c053da8cef23aa85b74a16a19b1b6da03a5ede6b83659f SHA512 f77c202e8500b7b10bee50ce9620bf8ac3b2ae6533869ce3686b4b44ce7adaff16312b57ce3cbf6d0d6409d137c97e1ecce9260de18d62dbf7f1289877139c89 WHIRLPOOL af21e0f6cb113c302176980e3875a22ffbe5d1c408c8c01421cc2a66f4ae89322e03498aef6e57b02ae865f073872b3b1a87874b910d55b415c695b106e77b7d
 EBUILD libgcrypt-1.5.1.ebuild 1776 SHA256 aeb4d3dd9201380dd9fb96262a4d1582944d71072ceb07d443946d6fce757551 SHA512 a0d1e7a0bf745123803c93dfd6033590af57e7bdd4fb0a08d6e9260f7b1aec5256863b1fb95c36b56a864d2e966bf313bc5147b61e71c9998121ba9853c63345 WHIRLPOOL c3b7831c72b332e63669c590ef601b508e27570e205133526500c4d4582a0d4091252ec77efee1c619464b77d8e3b22dc2929a77f38388c27c86cc09f3ec6907
-EBUILD libgcrypt-1.5.2.ebuild 1669 SHA256 988aeef285912ba9f4d452417076efea1a233b8676123d30d56fab9159ec3468 SHA512 a8274811ba73b8c8a33389f748d53c431370afe929af29f7081fbab62479e5dfd4adba32411fe3a7c890ee924529e57ec72c7abfe02c9e04d67932e2487533f3 WHIRLPOOL f1b8fdf54cf1d05f18594c67c9c11d67599524c674069fa17920455f2ed83b3995bb429f214fa28b567f523e8509a5954f778945ba3d81d9d91bdc2657f4d30b
-MISC ChangeLog 24735 SHA256 0e3cad25bb91890ff60c48dfe817aca4af8c44c02798986df7cf21686b3e15e7 SHA512 6006498120af482c7e6c65e06a203cc627aee9b005a5ec3372e43d1f84c8931dc0459531d28aee40250c0abc82998542a0b86021a04533642fea40f3e88070be WHIRLPOOL dca570f304b05edf0a71e42bf8204260dd92f8cd5a8ef0b30a5fa15429c9902faf9014e0fc251b9e9f9a70609bdf3b735681b606819dde7f52c06ecca605e167
+EBUILD libgcrypt-1.5.2-r1.ebuild 1640 SHA256 d210d83aa574d2e1c6bb8e80baa917ecdd6a1c321050c1b15d369642d7e7d80c SHA512 40b53174174fb6daddae59985d074a480bb6bce2a5d973d4f805013adbb61a7307d91d2541f789c4104b9ba0d10408edd49e468d864967b4e5cb4faf983f4626 WHIRLPOOL 5992148ca2b56537c437716a84c97e8cae69fbe45f2afe21ba06a1731db6ca26d546dc66b9c94a4c12a310abd3fe5d1f77ea0cfe11039afa19c18b647473e607
+MISC ChangeLog 25075 SHA256 cfe846fef7bfa5ee162daf642ee4a874f1d4cb82d737c03e4902533934c18828 SHA512 0fc6bc61b09ce7424ba220b82afffc0643d915d5e94c56e43ce20859cbf09c0620b2de3c04c4141b78bfc21f5016a5c5a0b82f76a45413be02205beaa747e66d WHIRLPOOL 1c621e3776af8b77c688e9f0bdbfa2b644e3973c5252b4fa72dc0ce8f8eec83b1925b96b02430e4f37e51ebe33a48a2c99c77deed36f459c32e43558c73482f1
 MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRfFPWAAoJEEqz6FtPBkyjoVwH/0ec5jz6azKR7rh1Au9DNrGL
-ObtGl8PfdCXfgEHowwDE0jG3pgwvzVVy2ykocUu/NfApm8NVaEoNRx8Phh9BcugL
-TH6FYooxxS4LM0qjhy2GKxdfNU6I0M1M7VpqyaeJiYPB5HnNw0llo5NjjUb2smU8
-YzISRPoKm3mnGELr9xnm/q+l7KHafnyETuNZSuUIbN46XQmbozwDE+zdavLt13Qj
-DQzbMJYhl/5UxHyV3ZYlfb3txfHBzA4ELNzugZuBhBzW8ztgmx5/3xrVn8AH1rW9
-BmTWGR/cwEQrsu/uvHwDLMCY6AE0CZ/aLURIOVn4jHIsg5wV9W2bc8TSBM+uslo=
-=0wHZ
+iQEcBAEBCAAGBQJRrmJrAAoJEEqz6FtPBkyjB3QIAKM7TYfRD48dbAYm7xlK/ISk
+RhO1Am5JDR3m5Zl/kbP0R3dgdA4n4rBTAqutZR5i4gcee9vM6nvpnQSE5Xo+241s
+5EgWDx3+Id1VTD8+kSFQZeMHWExauG3UPeFTVYkqizwPDWnT0mN8OGejvRXzdd3U
+HTO199e3YGgCqNNAJzjjurC3cceR/qV5EJe3D4EtQNDW2fT0eOk7CwcWLV12ZRAI
+eKK3wQzxaecoLQsc3AmDcbgxYAFPHD8b7YKzzb/ks0PhBeMDN3lOaYEkwLTspQzD
+ph9n6LrV8wXN0vCDpkXiXAygYzL3ED7aa3VCmrVNvXkWtIOvc7KD1+cZ373zlno=
+=F7Tv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild
index 17973bd84a1e..56af7dc3ebc6 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.2.ebuild,v 1.1 2013/04/27 22:40:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.2-r1.ebuild,v 1.1 2013/06/04 21:55:51 radhermit Exp $
 
 EAPI=5
+AUTOTOOLS_AUTORECONF=1
 
-inherit autotools eutils
+inherit autotools-utils
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="http://www.gnupg.org/"
@@ -14,38 +15,34 @@ SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/11" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps static-libs"
+IUSE="static-libs"
 
-RDEPEND="caps? ( sys-libs/libcap )
-	>=dev-libs/libgpg-error-1.8"
+RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
-
-	epatch_user
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
 
 src_configure() {
-	# --disable-padlock-support for bug #201917
-	# --disable-asm: http://trac.videolan.org/vlc/ticket/620
-	# --disable-asm: causes bus-errors on sparc64-solaris
-	econf \
-		--disable-padlock-support \
-		--disable-dependency-tracking \
-		--enable-noexecstack \
-		--disable-O-flag-munging \
-		$(use_enable static-libs static) \
-		$(use_with caps capabilities) \
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") \
+	local myeconfargs=(
+		--disable-padlock-support # bug 201917
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-O-flag-munging
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-}
-
-src_install() {
-	default
-	prune_libtool_files
+	)
+	autotools-utils_src_configure
 }