Version bump; remove old.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

5 files changed, 21 insertions, 166 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7610374e8ec1..3ee9df7e86f5 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.409 2013/02/21 18:43:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.410 2013/02/27 19:42:12 flameeyes Exp $
+
+*gnutls-3.1.9 (27 Feb 2013)
+
+  27 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +gnutls-3.1.9.ebuild,
+  -files/gnutls-3.1.3-guile-parallelmake.patch,
+  -files/gnutls-3.1.6-danetool.patch, -gnutls-3.1.5-r1.ebuild,
+  -gnutls-3.1.6.ebuild:
+  Version bump; remove old.
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> gnutls-3.1.8.ebuild:
   Add ~arm-linux keyword.
diff --git a/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch b/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch
deleted file mode 100644
index 5bb085793deb..000000000000
--- a/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/guile/src/Makefile.am
-+++ b/guile/src/Makefile.am
-@@ -124,4 +124,7 @@
- 
- .c.x: $(BUILT_SOURCES)
- 	$(guile_snarf) -o $@ $< $(snarfcppopts)
-+core.x: core.c enums.h enum-map.i.c priorities.i.c smobs.h smob-types.i.c
-+errors.x: errors.c enums.h
-+extra.x: extra.c enums.h extra-enums.h extra-enum-map.i.c extra-smobs.h extra-smob-types.i.c smobs.h
diff --git a/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch b/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch
deleted file mode 100644
index 54524d894c2b..000000000000
--- a/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnutls-3.1.6/src/Makefile.am.org	2013-01-20 21:40:25.090856708 +0200
-+++ gnutls-3.1.6/src/Makefile.am	2013-01-20 21:42:24.348037683 +0200
-@@ -191,7 +191,7 @@ libcmd_tpmtool_la_LIBADD += $(LTLIBREADL
- endif # ENABLE_TROUSERS
- 
- BUILT_SOURCES = ocsptool-args.c p11tool-args.c psk-args.c cli-debug-args.c \
--		cli-args.c serv-args.c srptool-args.c certtool-args.c
-+		cli-args.c serv-args.c srptool-args.c certtool-args.c danetool-args.c
- 
- danetool-args.c: $(srcdir)/args-std.def $(srcdir)/danetool-args.def
- 	-autogen danetool-args.def
diff --git a/net-libs/gnutls/gnutls-3.1.5-r1.ebuild b/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
deleted file mode 100644
index f85e4eee27a6..000000000000
--- a/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.5-r1.ebuild,v 1.4 2012/12/23 09:40:46 alonbl Exp $
-
-EAPI=4
-
-inherit autotools libtool eutils
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-if [[ "${PV}" == *pre* ]]; then
-	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-fi
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib"
-IUSE_LINGUAS="en cs de fi fr it ms nl pl sv uk vi zh_CN"
-for lingua in ${IUSE_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-unset lingua
-
-RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.5[gmp]
-	sys-devel/autogen
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-S=${WORKDIR}/${P%_pre*}
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	local dir file
-
-	# 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
-
-	for dir in m4 gl/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	# use system libopts
-	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
-
-	# force regeneration of autogen-ed files
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-silent-rules \
-		--disable-valgrind-tests \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm
-}
-
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	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.1.6.ebuild b/net-libs/gnutls/gnutls-3.1.9.ebuild
index a3c041c5f3e0..68edbc7b1c22 100644
--- a/net-libs/gnutls/gnutls-3.1.6.ebuild
+++ b/net-libs/gnutls/gnutls-3.1.9.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.6.ebuild,v 1.7 2013/01/20 19:56:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.9.ebuild,v 1.1 2013/02/27 19:42:12 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
-WANT_AUTOMAKE="1.11.6"
-
-inherit autotools libtool eutils
+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="ftp://ftp.gnutls.org/gcrypt/gnutls/v${PV:0:3}/${P}.tar.xz"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~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 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
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/libtasn1-2.14
 	pkcs11? ( >=app-crypt/p11-kit-0.11 )
 	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 )
@@ -50,10 +51,8 @@ src_prepare() {
 		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
 		doc/Makefile.am || die
 
-	for dir in m4 gl/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
+	rm -f {m4,gl/m4}/{lt*,libtool.m4}
+	find . -name ltmain.sh -delete
 
 	# use system libopts
 	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
@@ -63,8 +62,6 @@ src_prepare() {
 		rm src/$(basename ${file} .c).{c,h} || die
 	done
 
-	epatch "${FILESDIR}/${P}-danetool.patch"
-
 	# support user patches
 	epatch_user
 
@@ -82,6 +79,7 @@ src_configure() {
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-silent-rules \
 		--disable-valgrind-tests \
+		--enable-heartbeat-support \
 		$(use_enable cxx) \
 		$(use_enable dane libdane) \
 		$(use_enable doc gtk-doc) \
@@ -94,15 +92,10 @@ src_configure() {
 		--without-tpm
 }
 
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete
 
 	dodoc doc/certtool.cfg