Fix autotools usage, bug#501186, remove libtool manual cleanup

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

5 files changed, 131 insertions, 13 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index e803c498246f..f72211218bd2 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.464 2014/02/15 22:17:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.465 2014/02/15 23:34:13 alonbl Exp $
+
+*gnutls-2.12.23-r2 (15 Feb 2014)
+
+  15 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-2.12.23-r2.ebuild,
+  gnutls-2.12.23-r1.ebuild, gnutls-3.2.11.ebuild:
+  Fix autotools usage, bug#501186, remove libtool manual cleanup
 
   15 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org> -gnutls-3.2.10.ebuild:
   Clean old ebuilds
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a1a62ef541bf..afec686df001 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -9,14 +9,15 @@ AUX gnutls-2.12.23-CVE-2013-2116.patch 855 SHA256 473663119e3c0c91677becc2982f6b
 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.11.tar.xz 5135168 SHA256 b844c58a72d6930abbda42129f4051dbf97f91754bea3514931173e3d01cf3c1 SHA512 a373c807a23d427ad721c35efe98b46352a9a7f4cf4ca25193a7b91b7b6a5675b0ac071f8c782691c1a449a3bf1bd6e37c3eb003f2487c802a82f5e8caf417b8 WHIRLPOOL 9f6b0f160c5f0109febbf1ca500ddc764d59c30e8e632868190034dd829c5b6439346bca8ad3f593f7f39f5e5f3a77adc53f1e216aa256d92974f82048a8a222
-EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 da49a8d4219dd293e6016b0f9896db1f36a20f44f89766cd502c034a0920b8a1 SHA512 5c4fc5eebdc5480c873e1ea081c6ff87dbc83405d366459186f6ea0ec1ba6e9152403ae50406a934e5dc7a82920cbd0ee964d44217e1ec2f97b3fd546c8d68aa WHIRLPOOL d1adb02419f85d30b7cdc235279bd56b82764f9a314b64353baf408dde99ab9ab9afa050433cfdb9bbaf1951403d24425c76a22b85d59a946c591298c6e054cf
-EBUILD gnutls-3.2.11.ebuild 3417 SHA256 e372fc8bbb638142418780f8194c5c58678fb799e06f7f8161884ee9d363d9ce SHA512 f491fcb012c081e5dfe768d44436a6d092029bea4891ca207aa9e4f5a0d25410987ba97e447203956f5ff8552d7aa80656cff5d642bcb084892786bfd26454c7 WHIRLPOOL 552d0807f3cf88b13542eeb0f25dbdf99371e5457f9120befffad040901b2354a44fbc93a00b6910d8f39bf23c83df13e8136f62c317e48a3374bae2bf699d59
-MISC ChangeLog 68960 SHA256 7b932db0cf8a015787c81f7543e56b5d2790731cd7d8360a1dc462c6cccf6a1f SHA512 f08bf59d56672973404074aed6a156cac1feaaf676293bec5a585f25629130d851ff1706bc9b747a9257ecf26b110452e7d105a0d24f47414c3a9a67f150cd41 WHIRLPOOL da3476090b48be61d340b14b4d1aa9a01e688e3dda9e8f5a0ceb240216ba9fc8e094f8b057d2a05b2999edee292630e17810225bee2dddb32a54e221abe1af89
+EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 b4bf0653394f2c959d1ac5a8bd988a42432560890ffa128d1c0093afc20bab1a SHA512 750da86ba53bd8832f96710d06920c5272ea21afb4480d25dd923ba787a370de121dce3e55f5da59d6d662d745b4d48b3ab73505d4ff45a19688f4b578035a11 WHIRLPOOL 543def8eea855ac8780510cea986fc97fd3cef1c2fe5806699837bbf30d4fbc40739bb696b95cd1df6bc9fd8b4396f27e1c6babccb6f8360cd13f129c47455ac
+EBUILD gnutls-2.12.23-r2.ebuild 3192 SHA256 661d417920c0adb509b754ac369e2970bd2f0c658ed2b7d1cc041e57fe9788b9 SHA512 da4b678868a2c648e6496a86ac3f0144d3482aae863b771f490647fda2482c36fe99772c594269e02beae725e057bf0d856c4aac0fb6c5d565b56c19050067bc WHIRLPOOL 5b1319eae801da9af5de84aed1ecc94a78e4fc245bf67199abaeb0b3585ba98778e9afde6d76b240142aa3195998edf4d6e6b521499da1e8baab25ae7812bb7a
+EBUILD gnutls-3.2.11.ebuild 3346 SHA256 d9b7f16e2dbcf99c0a92e09857c60ba7ed410bf8f3123c867ed26929a19e50ec SHA512 b875f4effa2bda075a73996c3180e79d5c40fa0df9bbdbc274e31d4195d119704959a25590a57f7f6101398e85c8f91df99382cb86209f5b7f947b99f63444c5 WHIRLPOOL d2252a6c48cd32200f4d126b2e9f49e37c9a354311e7549466997daac5502cbb276c1314c8fed8e684a3045a963de241fc6748104d63838a3d5e8e00d6e2d630
+MISC ChangeLog 69185 SHA256 b085b915f8ff8bf2272ebdcd03511d655c3e4cf9aaa3d84a4b2487eb7d7bd43a SHA512 ba0b690ce43dcf580352107e4f05147503df8abb72f56bd018f402e0935f78ab60cf858477c98081df3224e9ce752be9640a115d73f7458e374de4f7b4582021 WHIRLPOOL e0f44fefd27b66d41fd10dfe7b2c769a5b25911c9ffa51fe7366d873b6259b1f5f5c2e5237f97cf31c26cc1d821cf3498e9098632d1ce29a12bda2970c833b01
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlL/540ACgkQXYk9GL8g3FGL6AD+PHIadlgrteFZDkIqkxAwFfRC
-l2nd742ZpuRaOL2cIasBAJ3NFRXrQu0M0pNhLJCRVnCULUyl3/6rLa8cARSXPNHr
-=oDKC
+iF4EAREIAAYFAlL/+XwACgkQXYk9GL8g3FHEbwD/VLVKLIyHMx4kkHUQlAATPTeD
+t04J710CcKxeubLRwiUBAKdcOFFBz1lTFX7BJc3RvcViM+JtP8ovWqL7vv15aBxo
+=/7Xp
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.12.23-r1.ebuild b/net-libs/gnutls/gnutls-2.12.23-r1.ebuild
index bdf425dbde1e..10392459c6ef 100644
--- a/net-libs/gnutls/gnutls-2.12.23-r1.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-2.12.23-r1.ebuild,v 1.13 2013/06/15 22:37:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r1.ebuild,v 1.14 2014/02/15 23:34:13 alonbl Exp $
 
 EAPI=5
 
diff --git a/net-libs/gnutls/gnutls-2.12.23-r2.ebuild b/net-libs/gnutls/gnutls-2.12.23-r2.ebuild
new file mode 100644
index 000000000000..fc74363a69f3
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.12.23-r2.ebuild
@@ -0,0 +1,114 @@
+# 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-2.12.23-r2.ebuild,v 1.1 2014/02/15 23:34:13 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="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	<dev-libs/libtasn1-3
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nettle? ( >=dev-libs/nettle-2.1[gmp] )
+	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
+	nls? ( virtual/libintl )
+	pkcs11? ( >=app-crypt/p11-kit-0.11 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+	fi
+}
+
+src_prepare() {
+	# tests/suite directory is not distributed
+	sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
+		configure.ac || die
+
+	sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	for dir in . lib libextra; do
+		sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' "${dir}/configure.ac" || die
+	done
+
+	epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
+	epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
+	epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2013-2116.patch
+	epatch "${FILESDIR}"/${PN}-2.12.23-hppa.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+
+	econf \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_with !nettle libgcrypt) \
+		$(use_enable nls) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_test() {
+	if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
+		elog
+		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
+		elog
+	fi
+
+	# parallel testing often fails
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps}
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-3.2.11.ebuild b/net-libs/gnutls/gnutls-3.2.11.ebuild
index dcaacf052cd8..a7795ea55077 100644
--- a/net-libs/gnutls/gnutls-3.2.11.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.11.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.11.ebuild,v 1.1 2014/02/15 03:59:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.11.ebuild,v 1.2 2014/02/15 23:34:13 alonbl Exp $
 
 EAPI=5
 
@@ -51,9 +51,6 @@ src_prepare() {
 		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
 		doc/Makefile.am || die
 
-	rm -f {m4,gl/m4}/{lt*,libtool.m4}
-	find . -name ltmain.sh -delete
-
 	# force regeneration of autogen-ed files
 	local file
 	for file in $(grep -l AutoGen-ed src/*.c) ; do