Version bump to latest releases. Update gnutls-2.12.14 to use EAPI 4 and add pkcs11/static-libs use flags.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 254 insertions, 15 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 779304c794f7..3249e99e0ee5 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.319 2011/11/05 19:28:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.320 2011/11/08 22:43:31 radhermit Exp $
+
+*gnutls-3.0.7 (08 Nov 2011)
+*gnutls-2.12.14 (08 Nov 2011)
+
+  08 Nov 2011; Tim Harder <radhermit@gentoo.org> +gnutls-2.12.14.ebuild,
+  +gnutls-3.0.7.ebuild:
+  Version bump to latest releases. Update gnutls-2.12.14 to use EAPI 4 and add
+  pkcs11/static-libs use flags.
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> gnutls-2.12.12.ebuild,
   gnutls-3.0.5.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d79d13b21761..da4b438eb862 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,26 +3,24 @@ Hash: SHA512
 
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.12.12.tar.bz2 7195302 RMD160 d0e26b56c44e363f95871c5e80359fab20176b25 SHA1 6c87591705b21f7cae845ecdae158a6c5d8f2847 SHA256 7cfd0a58b4e0810cbe9ec1c6854b56aeb9a3c29746a93836ee784b04de131181
+DIST gnutls-2.12.14.tar.bz2 7166618 RMD160 855c89c46898e7b934a8f6b7466d3089031c9f9a SHA1 e5680f78ee51ff9ebb9749b39504d3e981a19242 SHA256 5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3
 DIST gnutls-3.0.5.tar.xz 4306124 RMD160 7dda96427d173b9bc2ab49ba62397f692cd900b7 SHA1 9ded8c3c7888d8e34fd019fe9a9c641dbd721e83 SHA256 58120d5b23bb674a036b6519d784a7edaa79535ffad2def34bc0f05dc5ced3bc
+DIST gnutls-3.0.7.tar.xz 4292724 RMD160 fde59594f617c18d32eaa15bbac9e7e45dd8fd2d SHA1 b99aed5cb48e1c156a2e2c6b2becb6c049c299af SHA256 32c744274a8cb01887cdd5e72717b77fd3d31b3337c94c7b138fc16edac7b7c0
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
 EBUILD gnutls-2.12.12.ebuild 3086 RMD160 861e1f00c9138a2c9f5024ca492f7d56b41ea73d SHA1 fa16f660e4308740a71fa6b8bf6041245766d76c SHA256 f8b0d58bb3f7c18730bb3c7ee43ca474ddcf04916d9ad58eb7d959cf1f80ce16
+EBUILD gnutls-2.12.14.ebuild 3135 RMD160 88251de44cf0c853bc6a7481ad4576f330cf3642 SHA1 216750229e71d5b19cb8103f68a512c6c83dee36 SHA256 b40701f16f92520f26c92e7465d06b51387b59102f010ef8c49efe566a81dd3a
 EBUILD gnutls-3.0.5.ebuild 2693 RMD160 db576fe2f0fdd1b1ec5ba1c47a9510ea57d6fb6f SHA1 72e08c90dbaa01d50027ae01ab8e2a923db600df SHA256 f6e72c8f94af1621b28ca92a3ca0131ef1a3ea635ad3adef1b5d5cd3940446ea
-MISC ChangeLog 47907 RMD160 5744b4dc73665c6dd1e6c1e2f6809315ae8deb30 SHA1 f8a92e04a17c732a5cd57a1532ae91744ae6a2ba SHA256 6fe37473c69c8b20e0a193a3b4a15afbf747054b87380c16aaf60f735cbb9291
+EBUILD gnutls-3.0.7.ebuild 2686 RMD160 9d07e833183c94d2975564a94645a70cf9a0db97 SHA1 b4920173cb4be3eaab0100c0dbc722b5546d3197 SHA256 5d45c2d5fba853a4532e45d6da2c2b86f1502e9c3003bc76c1636660ac73afe6
+MISC ChangeLog 48176 RMD160 5f4cc490673066343a8fb3ef6633dd9d532c04a6 SHA1 e09118dc4cb9f6df695c4457dcf70017b45a2c73 SHA256 b10ec7c97f47519d01786b711265afa80be5766f80f21a273c64b0670020c143
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtY4jAAoJEPqDWhW0r/LCCrUQALZ4gTFriZRShUi99qhTA4YQ
-dtTwTHztwYoD0fF9mHNOKeN/ozWjDgib+BS2G0UNtBbTgM9Pob9DzRgfijejo2IH
-kyWmbmBLxi5sCKkNrnVyvGVfhwOiLMhlhLSX2Wxofp2rkJlt/dp+lF8ApgRV6ueP
-w/26JnFNjyS9Hdq5+QnAWPDHFm0T6NawLXfd0vHp0V4c/jv42BMcAwJ2YWMpBfQK
-AVJBse0hMk13E1SZU8hdb24cC3ynlM35ZY8Hwp1JhObh1rgNhzppwhvIAmdPSPJ1
-Xb+uK5oc6BrdjAYwPxgpJDG3la9uTwiOXRDioe6nvG6bIZswzu39inY2L3kzANAx
-8HJE3Vi5Xd0n+e+bVPOe3MKk3Kf/ckU+17Uk9QyP+kiNT9RN19ucpiIBIgi4yQPx
-1i9ePb6FxAqLJ0a6EXcz0FPada8YqEtCJl1/T7Jxd+qOhAWtUSJeSKViUNgLe1dc
-ozFOxz2kZWP9MgsMPrlE/S5AdXT+oLvpEiP9DJiwNEKWl6yVMw1gm4qSe4IMimm4
-//JYLIgMJcY3pUVNBR0VZ9pkxTHYW81IY0jCbWljSDjp0BMZ2tR5P8RfAJ+GSFdv
-lTAgUgNxW3vQ3xOaMOUW0PKzYaqP4usqh8LCEuQtKbFoNK/TQEn4mca5NZ1PMlYM
-dAOpsF3V+PuGD6wwOfbL
-=Dlpj
+iQEcBAEBCgAGBQJOubCZAAoJEEqz6FtPBkyjjeoH+gN6d2EG3dWmYUSXFDXuLDR9
+dqIzWz+/l7NOcpgjjIPVM9oiVB8ZvT1wZ1TaSH5bNZ3pRGAx6U+VnPLkARwiCqP+
+tulz3mgL9f+aMzXceNKYx7LKPq0Xo1xWOV3+6IZB0DL+Yy7vCblvwWJoJTlLP2kM
+idfVkxDQUgb7ONIjzZQnzq0Dkcbql+mvb18z9erak+0PpVBMuAW1i0K+XRhRRGut
+I9q1XOLoo/8RzIQ/wia4VT8P/ZpRUnwb8CkOofFi+qGC3vMYEUzOrassjqwCsfzH
+RVQgrmzZlveD5VOlzI6EKNqRrdk2zgyzYXilDMRKV9Hf7c6LDNfDTlhwNfhrEak=
+=lFNo
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.12.14.ebuild b/net-libs/gnutls/gnutls-2.12.14.ebuild
new file mode 100644
index 000000000000..7ccf57020715
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.12.14.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.14.ebuild,v 1.1 2011/11/08 22:43:31 radhermit Exp $
+
+EAPI=4
+
+inherit autotools-utils libtool
+
+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
+	MINOR_VERSION="${PV#*.}"
+	MINOR_VERSION="${MINOR_VERSION%%.*}"
+	if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
+		#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+	fi
+	unset MINOR_VERSION
+fi
+
+# 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 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	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 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	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 )
+
+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
+
+	local dir
+	for dir in m4 lib/m4 libextra/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+	for dir in . lib libextra; do
+		pushd "${dir}" > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	# 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=/usr/share/doc/${P}/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
+
+	default
+}
+
+src_install() {
+	default
+
+	remove_libtool_files all
+
+	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.0.7.ebuild b/net-libs/gnutls/gnutls-3.0.7.ebuild
new file mode 100644
index 000000000000..dd543ea62bf3
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.0.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.7.ebuild,v 1.1 2011/11/08 22:43:31 radhermit Exp $
+
+EAPI=4
+
+inherit autotools-utils libtool
+
+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
+	MINOR_VERSION="${PV#*.}"
+	MINOR_VERSION="${MINOR_VERSION%%.*}"
+	if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
+		#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	fi
+	unset MINOR_VERSION
+fi
+
+# 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 ~sparc-fbsd ~x86-fbsd"
+IUSE="+cxx doc examples guile nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	>=dev-libs/nettle-2.2[gmp]
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( virtual/libintl )
+	pkcs11? ( app-crypt/p11-kit )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
+DEPEND="${RDEPEND}
+	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
+
+	# tests/suite directory is not distributed.
+	sed -i \
+		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+		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 {} \;
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	[[ ${VALGRIND_TESTS} != 1 ]] && myconf+=" --disable-valgrind-tests"
+
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		$(use_enable static-libs static) \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_with pkcs11 p11-kit) \
+		$(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
+
+	default
+}
+
+src_install() {
+	default
+
+	remove_libtool_files all
+
+	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
+}