Version bump + cleanup, bug#528824

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

5 files changed, 19 insertions, 177 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index a978edd5d154..09ac0ce4b69a 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.515 2014/10/13 13:03:42 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.516 2014/11/10 18:39:07 alonbl Exp $
+
+*gnutls-3.3.10 (10 Nov 2014)
+*gnutls-3.2.20 (10 Nov 2014)
+
+  10 Nov 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.2.20.ebuild,
+  +gnutls-3.3.10.ebuild, -gnutls-3.2.18.ebuild, -gnutls-3.3.8.ebuild,
+  -gnutls-3.3.9.ebuild:
+  Version bump + cleanup, bug#528824
 
 *gnutls-3.3.9 (13 Oct 2014)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 8efdd10b2eb7..91ef9a3a938e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -15,19 +15,17 @@ AUX gnutls-2.12.23-gdoc-perl-5.18.patch 4878 SHA256 a55a56b8faead4e7c369945d3561
 AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 0644a00f75987f8a8906ec536b4b29967c24ae22ece8dfee074af3f85be566b5 SHA512 ea3062f90ace33a6229fe10f9a1fb492e84905dce0231309d2c105386c45a151d99c140c66158435ebe4781defc5a536775f4d68b3552208885636e5ed4b7223 WHIRLPOOL ee131aa7709e717cf5e893d5073dbc7eeec569e2a6e48094534dcf8f0d3d17b8a4f75da0a2c91ed2d70e37ef4429d7759dffce4948fd508dcbc0e081a8d98aa0
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
-DIST gnutls-3.2.18.tar.xz 5154476 SHA256 4762afab5e1b9e829c5f53d2b00cd5e41d43fa6d035efcf239e3fe0459134d45 SHA512 fc364be7997d31e1a1855d871b4a9564ee5a3e9c2900839f9c32fcc656e67c916ef634508bc0363b8b3f0cba131c97596509f838c1e9b3ac2b56b224eee43908 WHIRLPOOL 6da2bcfca5755a7fd3ce922b3bbeb21a44c2fc5446b342361577a4eb216ae01867cbf49d01fe44a75ca850dbf960c481e5f122f37669ea404e5213fc8b0e5491
-DIST gnutls-3.3.8.tar.xz 6153180 SHA256 bd4642f180e19632f4ed3a1e62d60c824c7b695f5cddf41a8fba1b272eaef046 SHA512 6b778df551a4eea1e920be0596137ca1e5995392f7a2e489beb79124cadac132111f0f763beb2857b6d305b3c4b8378c48e2106daf9e10a7dee3a2dbd9b833fd WHIRLPOOL cd1c3f9f59831eef10fcf8278bfe35f19d6c52aa2a7020ac7fcad4c3609a998ee375bf0ebeab8db7fe1ec0d0257859662690bfdd611aba9b351a44348e266d9e
-DIST gnutls-3.3.9.tar.xz 6166148 SHA256 39166de5293a9d30ef1cd0a4d97f01fdeed7d7dbf8db95392e309256edcb13c1 SHA512 c92c0b2fa3cad83945c5d269268d2f0699d40ce59f6d2dd446ee9ee7b6aeca43e2070d14e4a9f595dd0415033d8023a6ae7b0c44b5506f3112e4e8932a07d672 WHIRLPOOL db2c51e6b052c34331e598912d4423b9959e8da16534ea3a564bb98f08a5fa78a6232a80cd71e22cc824f2067a9f4f63f058783d01aa5620c089f88c39bc79ad
+DIST gnutls-3.2.20.tar.xz 5160184 SHA256 7967057e78c3ed968e524a07ab262681219b73001ab8e75cbc4f1a506abdb598 SHA512 06e0ea54dfcf27c7841ee3679fd5387dcf31ca4df685723b81f8d9403d74f5f11dcd014704ccc4ff5a3a8db78276240e1945c35c3ec32b7f819d2760ae9e5c81 WHIRLPOOL b455b4a39567b7b6f261d8a53ae7cdd01862d4499ad5c7ac39bdfa8ee8b6753ed2ac664e54de7184c4f991237e82430a7768b23581539b04f78e83921c1e98ae
+DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
-EBUILD gnutls-3.2.18.ebuild 3486 SHA256 ca2dd4018e16bb135f6e9ebfff76de7c8090c14d78c2190c1e4de2fbea42abd2 SHA512 8cd08ad3018fdaa18a38d87fb3b68a42167eed9b226a117ddf43bde35a5b0506001114c1ae4b83510f628ab143b59b01220a3e7db07ec263df8d5f09e9ca9293 WHIRLPOOL 33b36c21546849af576c66157c884614a3b136dc2e23e167de43625ce4d6bed68e80120c01879ffe3712c3c4bddd3c914897d430ce464df92ca5d6447c27a631
-EBUILD gnutls-3.3.8.ebuild 4764 SHA256 61acf3310fc9ed961f4db76ee6139a9d70cc85b8b33f243c6cc65820a45b9680 SHA512 a98eba6c73506daa7cf927456db1a70abe86a1824b38aa6b57642a0ab283aed2ef25d6448b5f3087204f14a67180f267c9142db7113e5d35651376d3899da9c9 WHIRLPOOL d141267e7478cd51a12428eb486c35df151fda88afe8fa6c9e3f315c9e1613948c238a8ed5937ae98dee4a8b9385a14db0c34a0aba528be055f1333ed937eb5a
-EBUILD gnutls-3.3.9.ebuild 4764 SHA256 9463b8df512903f7195c048fa46cf4f36252aacc13ac38f0705d081ad7efcf6a SHA512 385e10baf35ec2bcc342cafab9f8177902ddbd9a0881d5e94672c606ac1565e721ca0ff59e2298f0eb4d8c86cb002725974c5bd0d956182fa97ea25b804f35c9 WHIRLPOOL 0ee0d21bad588ee8f6d6b40d45ad6eb61f9d0339635c2a35d99d8ec6caf68da828b1df4143cf1fcd990143ee4ad80da8d5f4382cf8f6a4a52c3b78a997f0e836
-MISC ChangeLog 77174 SHA256 40031d7ec56174226e634e3ea53ed6932ce2cb782ad5da01d64b7c0a5ccb514a SHA512 81930263e7ae9b280cf6f1a48cbff82315c2839857db596bf40fe178cba62b169dc413f12b1f2c649925400634f7fc2ceaf85a15d75f9a88ef442c23bef4b732 WHIRLPOOL 21ad696800c28b2ddbadbc37f47fefb7989664309297f77ea5e9e7ceebaf59056137df5bbf75fadcd0de10b7a879fef11a29401f124456c7575778963224860c
+EBUILD gnutls-3.2.20.ebuild 3486 SHA256 015e88770e35facab5330b6605cb894be56d6dad00dad366a2ba894d3384c716 SHA512 86d0d799bb09b785cc161709b4d593a0edf8a93445d2ee97dbf0443e9a828c046b64e008ad54bd37f4cda25a82c24df0cab8c0912eb19d25cea57f8c3c78acc9 WHIRLPOOL 3c3edb3b66b830b14a7376b9e6f4240621999acc8ee0195b41b3e0758eb937e0a58dfc0a9b1f63a2f39ec6eec30a02ba2d5d8421eb96fc01eb76148a8a642d0b
+EBUILD gnutls-3.3.10.ebuild 4765 SHA256 59164cfb5d0cd3fd16b05c514fbacfd81ed95392f06675494e72370c7cb13fef SHA512 559627c4165658a8ea84b35f2d5abbab15e34faf1976ce411a142a53fd07c1e68a6d08739ed9decddeef425ea21e42766b1c41a5fadb06c866b394f446ef62d9 WHIRLPOOL 4d9bcfe04086c539f247d3e458542eb71abb6a7b86834e7e62fcaa4f8446ffde5ef2d96f3f76dd7e168ce45b436400465d3148f2782f2667c09da8c4f0752d33
+MISC ChangeLog 77436 SHA256 313e2b89aff39e61bf1bc8a0f3ec430c3ad578f0606157b476773159a0dcf167 SHA512 398a657cab3444c72716ac63eb493a4840d827921172d6f42b03f2aa26e35267e210946f52d204d7611caf1df289c6e52021424f0195b5bbd52ed1f2934ac3d5 WHIRLPOOL ea1d6b31bfdb8fa1860120c89c129f2a0125a5c9bac395674c6aa0b24a1a58e23e29c495994f1956decd984e119b43619d8a250cdee3f07abf1f26ac824c3963
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQ7zbIACgkQXYk9GL8g3FFbxgD/fJz8dMNaxmTbrLCU1g6RrnJg
-HfVl06gRLfdloYOf/CAA/j2Urozh+aGgZ6jcT642ao2GC0+gT7JdHhlbQc0w4Ox6
-=Q1YF
+iF4EAREIAAYFAlRhBlEACgkQXYk9GL8g3FGOUwEAm0Mqa/hQeHJ8SYERAn4V7mXr
+e2om8++VVP8Jf5ASqyQBAItli7HOPiVutCFYVmTO7eErlDcTJJFAzqTGTdzIwgxv
+=vsVF
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.18.ebuild b/net-libs/gnutls/gnutls-3.2.20.ebuild
index 6cb353dad52a..16b18eb6b166 100644
--- a/net-libs/gnutls/gnutls-3.2.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.18.ebuild,v 1.1 2014/09/19 08:45:55 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.20.ebuild,v 1.1 2014/11/10 18:39:07 alonbl Exp $
 
 EAPI=5
 
diff --git a/net-libs/gnutls/gnutls-3.3.8.ebuild b/net-libs/gnutls/gnutls-3.3.10.ebuild
index 97896dc04fa5..acafbf80fde8 100644
--- a/net-libs/gnutls/gnutls-3.3.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.8.ebuild,v 1.2 2014/09/23 06:39:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.10.ebuild,v 1.1 2014/11/10 18:39:07 alonbl Exp $
 
 EAPI=5
 
diff --git a/net-libs/gnutls/gnutls-3.3.9.ebuild b/net-libs/gnutls/gnutls-3.3.9.ebuild
deleted file mode 100644
index bca1beb89e19..000000000000
--- a/net-libs/gnutls/gnutls-3.3.9.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.9.ebuild,v 1.1 2014/10/13 13:03:42 alonbl Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=sys-apps/texinfo-5.2
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# force regeneration of makeinfo files
-	# have no idea why on some system these files are not
-	# accepted as-is, see bug#520818
-	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
-		rm "${file}" || die
-	done
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	ECONF_SOURCE=${S} \
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc gtk-doc-pdf) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-
-		# symlink certtool for use in other ABIs
-		if use test; then
-			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
-		fi
-	else
-		emake -C gl
-		emake -C lib
-		emake -C extra
-		use dane && emake -C libdane
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		# parallel testing often fails
-		emake -j1 check
-	else
-		# use native ABI tools
-		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
-			"${BUILD_DIR}"/src/ || die
-
-		emake -C gl -j1 check
-		emake -C tests -j1 check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C lib DESTDIR="${D}" install
-		emake -C extra DESTDIR="${D}" install
-		use dane && emake -C libdane DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	else
-		rm -fr "${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}