Cleanup

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

4 files changed, 9 insertions, 307 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 1c0d408f3704..844f72cbb055 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # 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.519 2014/11/24 00:20:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.520 2014/12/13 23:43:14 alonbl Exp $
+
+  13 Dec 2014; Alon Bar-Lev <alonbl@gentoo.org> -gnutls-3.2.20.ebuild,
+  -gnutls-3.3.10-r1.ebuild:
+  Cleanup
 
   24 Nov 2014; Michał Górny <mgorny@gentoo.org> gnutls-3.3.10-r2.ebuild:
   Add work-around for gtk-doc out-of-source build issues, bug #519762.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 07701bd77508..e049245f2a72 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -15,30 +15,15 @@ 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.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.20.ebuild 3486 SHA256 015e88770e35facab5330b6605cb894be56d6dad00dad366a2ba894d3384c716 SHA512 86d0d799bb09b785cc161709b4d593a0edf8a93445d2ee97dbf0443e9a828c046b64e008ad54bd37f4cda25a82c24df0cab8c0912eb19d25cea57f8c3c78acc9 WHIRLPOOL 3c3edb3b66b830b14a7376b9e6f4240621999acc8ee0195b41b3e0758eb937e0a58dfc0a9b1f63a2f39ec6eec30a02ba2d5d8421eb96fc01eb76148a8a642d0b
-EBUILD gnutls-3.3.10-r1.ebuild 4800 SHA256 387f2a208384adcdf4ad3460b48a586133d373488a6abe5daad8a024e16f751d SHA512 23ca14ae69f03642c82a19efed704963f777b54da7d7b31a4bf0cd17892a8e1b90917937f0747181edf65c3e399daf54739867ea867a02e3e230e410b5cf3b39 WHIRLPOOL 838bfe0e9bba5fa942af55ac52e51ab999fc987a9c69eac909683cb4227d68ab1bcc6d3de801912baac8e2451ef3ac3e22c2461557bb10665ac130d343c839ff
 EBUILD gnutls-3.3.10-r2.ebuild 4920 SHA256 8cbe81a879560cea70337909d4fdeea0b142a8a4769cbcea05e7e8550f48c55d SHA512 6d1bdc138617c92260c4a716be4c68057503738d3812fccac5a0a4cd65dac4357d4a22f9a95c568bf5b3ecd00f193787eadab7944bb3319c5d933ddc8f523f6c WHIRLPOOL 2664b0549a030de56f959fce5271979ab638766aecfe4b2e6b762969fea0c17d43e84edc5bfbebe73446613bd94e0c0b74efe4d54bab70bd9ac90e26d67c1492
-MISC ChangeLog 77941 SHA256 b33ed61d9045d32406db606657acc8fcd8b918ed5fba065c3e047c48837da787 SHA512 b38c4e4b939fee50912a06a52e5887065d00d24cf5facc3e67755b3ef67afaad4f3343249700f5dcda532874aa883086dec8509c03b2166f35ff7dc7bc300a3a WHIRLPOOL c9b1780154f4423079430b1e29eb9261bc143eee0f34a23d391ead9b3b04176c0a1e453b3b90d278c7c3cfd4c60c8e3a2f265296c6c1de1519800c5d2630e74f
+MISC ChangeLog 78051 SHA256 9dd082f7035cfcbb71dd58e29086a6190d964c0b03cce7b18dfece4cff3061d2 SHA512 b1880e3041623c52a4d27859dd2ba9f69d9cba33aa9acc025fa7dab53d7e68def0e45f8977b362fe2f9bc6f1c97597ac20a51c357cc90df3aaeb425640d549c0 WHIRLPOOL bd25f127fc8aa98d93fbe2facda7f8bc3639220cb47a23e81c24da3e52c0758de05fa3b261604ebb881621f42aac4dd66a776e9112ec5984f239ba2683e53339
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUcnm5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkm8QAKkPrgl+Q/CE8PgM42B1Bq78
-got5J+T1Rb2DYONRFzEGxOd+9paRNmAVWp6g/LliXhwpuxjPbCclRR61LgtLrn26
-nepmXRJjx667UExqZoMhABtjLBErroCmu/fuwUq+1ST3bGbpez4iwqM1zUttE/UQ
-i638Jr2ovCxRnqadh2ie+1kphLFVNe6ld7REV2JKCpfU/w8bd2RDF6GfhtL8ULhs
-09VCGaSTU+TzrtUqaT+TeKDl4jOwnuvh/HPzhslXYy4a7We4rH3JQrVRNPqr7yUs
-37v3M2nTc1Z/9U2B8si1Tp94M273qHHyrBr9calY2K0BUkTBwgF5qftfQWhdd9Q2
-oqFR2Ns4NykbRVCW+y0v5prV5KSHBtdo/JXS6VaWPEAXBumqlMzWymgKh1B2I4Zl
-M9KIVEuCk7jlOwoYuRax5OLwR5pIpcZ9Zwrox2bOZVoRdfpW6sWaYSR5jSWZDcIS
-6VWn5Lutj+404CopaOYKF3qEcAF9J2OKzrBFGnAHec2bnbJFEJc2j9mq+87pthEa
-pD34oN89g9wymYZGJgeW7INILKUQz+bmyK3qgPZsqidX60qvEh60ss2beaPUIxBw
-cEToroGR/JnO3ZtN0hMVlTyccveCnrS+cXNs/cmBzxtEub5tMIkYsr/weZQbr9nr
-UQkXS9EY5eNssjaoeCj/
-=wK+c
+iF4EAREIAAYFAlSMzx4ACgkQXYk9GL8g3FFylwEAnehp7LWFPJGMNEtndJguq3Nk
+9uAORUZQlP8OvswHiD8BAIrC0eONz4Mt6auYH/is9D1Jnha8hTND5ZNTJng/LGTI
+=2Kmr
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.20.ebuild b/net-libs/gnutls/gnutls-3.2.20.ebuild
deleted file mode 100644
index 16b18eb6b166..000000000000
--- a/net-libs/gnutls/gnutls-3.2.20.ebuild
+++ /dev/null
@@ -1,122 +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.2.20.ebuild,v 1.1 2014/11/10 18:39:07 alonbl Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils 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-2.14
-	>=dev-libs/nettle-2.7[gmp]
-	dev-libs/gmp
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig
-	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() {
-	# tests/suite directory is not distributed
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
-		configure.ac || die
-
-	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
-
-	epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-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 \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-src_test() {
-	# parallel testing often fails
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.3.10-r1.ebuild b/net-libs/gnutls/gnutls-3.3.10-r1.ebuild
deleted file mode 100644
index 19ebeb6d7297..000000000000
--- a/net-libs/gnutls/gnutls-3.3.10-r1.ebuild
+++ /dev/null
@@ -1,165 +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.10-r1.ebuild,v 1.1 2014/11/23 18:56:21 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.9[${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 \
-		--without-included-libtasn1 \
-		--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
-}