Version bump + cleanup

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

5 files changed, 11 insertions, 242 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 9e7e04d5142b..5e74e919c2cd 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.548 2015/06/21 06:39:45 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.549 2015/07/12 14:33:50 alonbl Exp $
+
+*gnutls-3.3.16 (12 Jul 2015)
+*gnutls-3.4.3 (12 Jul 2015)
+
+  12 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.16.ebuild,
+  +gnutls-3.4.3.ebuild, -files/gnutls-3.4.2-build.patch,
+  -gnutls-3.3.15-r1.ebuild, -gnutls-3.4.1.ebuild, -gnutls-3.4.2-r1.ebuild:
+  Version bump + cleanup
 
   21 Jun 2015; Alon Bar-Lev <alonbl@gentoo.org> -gnutls-3.3.10-r2.ebuild,
   -gnutls-3.3.12.ebuild, -gnutls-3.3.14.ebuild:
diff --git a/net-libs/gnutls/files/gnutls-3.4.2-build.patch b/net-libs/gnutls/files/gnutls-3.4.2-build.patch
deleted file mode 100644
index c1c2dcf6d8ed..000000000000
--- a/net-libs/gnutls/files/gnutls-3.4.2-build.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 1997ac0f475488849d3f55fecd3dcad6d10193ef Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 16 Jun 2015 23:47:41 +0300
-Subject: [PATCH] tests: cert-tests: pkcs7: support separate builddir
-
-please consider to always check package using separate builddir before
-release.
-
-please consider adding quotes all over in shell scripts, to support
-spaces and other special characters within base path.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- tests/cert-tests/pkcs7 | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7
-index 04e4058..7d28c84 100755
---- a/tests/cert-tests/pkcs7
-+++ b/tests/cert-tests/pkcs7
-@@ -39,7 +39,7 @@ if test "$rc" != "0"; then
-   exit $rc
- fi
- 
--$DIFF $OUTFILE $FILE.out >/dev/null
-+$DIFF $OUTFILE $srcdir/$FILE.out >/dev/null
- if test "$?" != "0"; then
-   echo "$FILE: PKCS7 decoding didn't produce the correct file"
-   exit 1
-@@ -86,7 +86,7 @@ if test "$rc" = "0"; then
-   exit 2
- fi
- 
--$VALGRIND $CERTTOOL --inder --p7-verify --load-data pkcs7-detached.txt --load-ca-certificate $srcdir/../../doc/credentials/x509/ca.pem --infile $srcdir/$FILE
-+$VALGRIND $CERTTOOL --inder --p7-verify --load-data $srcdir/pkcs7-detached.txt --load-ca-certificate $srcdir/../../doc/credentials/x509/ca.pem --infile $srcdir/$FILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -106,7 +106,7 @@ if test "$rc" != "0"; then
-   exit $rc
- fi
- 
--$DIFF $OUTFILE p7-combined.out >/dev/null
-+$DIFF $OUTFILE $srcdir/p7-combined.out >/dev/null
- if test "$?" != "0"; then
-   echo "$FILE: PKCS7 generation didn't produce the correct file"
-   exit 1
-@@ -114,7 +114,7 @@ fi
- 
- # Test signing
- FILE=signing
--$VALGRIND $CERTTOOL --p7-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile pkcs7-detached.txt >$OUTFILE
-+$VALGRIND $CERTTOOL --p7-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile $srcdir/pkcs7-detached.txt >$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -133,7 +133,7 @@ fi
- 
- 
- FILE=signing-detached
--$VALGRIND $CERTTOOL --p7-detached-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile pkcs7-detached.txt >$OUTFILE
-+$VALGRIND $CERTTOOL --p7-detached-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile $srcdir/pkcs7-detached.txt >$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -142,7 +142,7 @@ if test "$rc" != "0"; then
- fi
- 
- FILE=signing-detached-verify
--$VALGRIND $CERTTOOL --p7-verify --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --load-data pkcs7-detached.txt <$OUTFILE
-+$VALGRIND $CERTTOOL --p7-verify --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --load-data $srcdir/pkcs7-detached.txt <$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -152,7 +152,7 @@ fi
- 
- # Test signing with broken algorithms
- FILE=signing-broken
--$VALGRIND $CERTTOOL --hash md5 --p7-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile pkcs7-detached.txt >$OUTFILE
-+$VALGRIND $CERTTOOL --hash md5 --p7-sign --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile $srcdir/pkcs7-detached.txt >$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -170,7 +170,7 @@ if test "$rc" = "0"; then
- fi
- 
- FILE=signing-time
--$VALGRIND $CERTTOOL --p7-detached-sign --p7-time --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile pkcs7-detached.txt >$OUTFILE
-+$VALGRIND $CERTTOOL --p7-detached-sign --p7-time --load-privkey  $srcdir/../../doc/credentials/x509/key-rsa.pem --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --infile $srcdir/pkcs7-detached.txt >$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
-@@ -185,7 +185,7 @@ if test "$rc" != "0"; then
- fi
- 
- FILE=signing-time-verify
--$VALGRIND $CERTTOOL --p7-verify --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --load-data pkcs7-detached.txt <$OUTFILE
-+$VALGRIND $CERTTOOL --p7-verify --load-certificate $srcdir/../../doc/credentials/x509/cert-rsa.pem --load-data $srcdir/pkcs7-detached.txt <$OUTFILE
- rc=$?
- 
- if test "$rc" != "0"; then
--- 
-2.3.6
-
diff --git a/net-libs/gnutls/gnutls-3.3.15-r1.ebuild b/net-libs/gnutls/gnutls-3.3.16.ebuild
index 49beb33b8349..708e61e248e6 100644
--- a/net-libs/gnutls/gnutls-3.3.15-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15-r1.ebuild,v 1.1 2015/06/17 18:42:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.16.ebuild,v 1.1 2015/07/12 14:33:50 alonbl Exp $
 
 EAPI=5
 
@@ -23,7 +23,6 @@ IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
 	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	<dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
 	sys-devel/autogen
 	crywrap? ( net-dns/libidn )
diff --git a/net-libs/gnutls/gnutls-3.4.1.ebuild b/net-libs/gnutls/gnutls-3.4.1.ebuild
deleted file mode 100644
index 8738e2642de5..000000000000
--- a/net-libs/gnutls/gnutls-3.4.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.1.ebuild,v 1.1 2015/05/03 19:08:41 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/30" # libgnutls.so number
-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 +openssl pkcs11 static-libs test +tools 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-3.1[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	tools? ( 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.23.1[${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}]
-	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)"
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-}
-
-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 tools) \
-		$(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) \
-		$(multilib_native_use_enable test tests) \
-		$(use_enable nls) \
-		$(use_enable openssl openssl-compatibility) \
-		$(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_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
-}
diff --git a/net-libs/gnutls/gnutls-3.4.2-r1.ebuild b/net-libs/gnutls/gnutls-3.4.3.ebuild
index 01c6598ad9c3..9829bd7cb7b5 100644
--- a/net-libs/gnutls/gnutls-3.4.2-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.2-r1.ebuild,v 1.1 2015/06/17 18:42:05 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.3.ebuild,v 1.1 2015/07/12 14:33:50 alonbl Exp $
 
 EAPI=5
 
@@ -69,8 +69,6 @@ src_prepare() {
 		rm "${file}" || die
 	done
 
-	epatch "${FILESDIR}/${P}-build.patch"
-
 	# support user patches
 	epatch_user