Version bump. Fix dependencies (bug #337661).

Package-Manager: portage-2.2_rc96_p20/cvs/Linux x86_64

3 files changed, 109 insertions, 12 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index dd666de2b085..bcc66434d213 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.267 2010/10/11 22:17:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.268 2010/10/16 00:11:43 arfrever Exp $
+
+*gnutls-2.11.2 (15 Oct 2010)
+
+  15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gnutls-2.11.2.ebuild:
+  Version bump. Fix dependencies (bug #337661).
 
   11 Oct 2010; Markus Meier <maekke@gentoo.org> gnutls-2.10.1.ebuild:
   arm stable, bug #337139
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d5ca8f7bb04b..6af2f15ce450 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
 DIST gnutls-2.10.0.tar.bz2 7443055 RMD160 df2bdc20b841205fa20c8893dc3cb11a35946e2e SHA1 16c94a1262f8ea3c4dd34eec495bd57203bbcd3a SHA256 8596643ce143bf6dd933594dd12da10024b4284cdd1fde758aeff65cbaf68c88
 DIST gnutls-2.10.1.tar.bz2 7442084 RMD160 c7f9ca00f326f93331b139af34f3dd5d2db43626 SHA1 507ff8ad7c1e042f8ecaa4314f32777e74caf0d3 SHA256 731078bc11661411ba47b20a65024abeca40d43a1b3c4526a6599b7905c302ee
 DIST gnutls-2.10.2.tar.bz2 7458438 RMD160 21249b1ab9e2952bd65c7039e0a833837934c108 SHA1 2704b7b86fc5e3444afcf20feb7bc9ff117d4816 SHA256 e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724
 DIST gnutls-2.11.0.tar.bz2 6692201 RMD160 a4fa542ae687aad27ca01466a2e70538e498dbbb SHA1 951d27dae2ab478d15e067ba1cda92b69c45ae31 SHA256 0298fb1b6ce30df46044d78cd719aa92b50c3537d83a82819aef4efb587997f5
 DIST gnutls-2.11.1.tar.bz2 6857211 RMD160 fcc1e19a28db47071bc731b442304a3f35fbef10 SHA1 b78fa03a717357e9ae13e256113c2e11ea7f2deb SHA256 1fb0ece199b1e6a358bfe655163c9d19a0f6757135efb3f7469b37849ea71f35
+DIST gnutls-2.11.2.tar.bz2 6905383 RMD160 670c99a1220c77acd3d6a885cc2cee36509771af SHA1 5b50ade9b531c9ae66706f69a0c7b2fc8bc54160 SHA256 7bb853c886e3d7f79b19f8bee1e63134bb9a49f674689fcef5c6fab02c3fa452
 DIST gnutls-2.8.6.tar.bz2 6469369 RMD160 1cfda29a60df3b032b8b611e4341c2e834bb26b2 SHA1 bff911d4fd7389aa6698a644b3748eb2d23715bc SHA256 d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
 EBUILD gnutls-2.10.0.ebuild 2498 RMD160 bde262a32d044cd508e51e955e122e1b1f14c100 SHA1 1903a8688365d35dd75ccfd13d004fb948611717 SHA256 f8b6da91b8f4beed9b2bb6be55721912fea102d754002b0ed637a4f7db792592
 EBUILD gnutls-2.10.1-r1.ebuild 2524 RMD160 f187ebaa1b622f2f68dabb888835aaaabeea613e SHA1 be871099fcb067c91a18d7c624dad3b99637756f SHA256 94ad932bc1570d9debe05408faf0c553f9e9ea5e31c56c317902ae666bf329da
@@ -14,13 +12,7 @@ EBUILD gnutls-2.10.1.ebuild 2507 RMD160 ebd66d8b7e70b3a18b81ea805a7d20ce4b5eb1a9
 EBUILD gnutls-2.10.2.ebuild 2477 RMD160 abd7931d22b2ef7ed2fe0817280e0d4119b9135d SHA1 95201fd86568d00cb615fdff63948ec3248f760e SHA256 962c232f0e68cd8dc2f597468115b45bb2da52fe5e3a204a4d08972f062d9c92
 EBUILD gnutls-2.11.0.ebuild 2578 RMD160 fc2961655b31b472be97ef37572ff34facd13828 SHA1 b9d550ea691f3de569cb7f20cdff522f3ff5e9f6 SHA256 23ce9ad7fc9cd9b1b076d4c637d44e2591abd69294108b3ac117cbacd54535cc
 EBUILD gnutls-2.11.1.ebuild 2678 RMD160 50b8fb9898cc7ec0b44938588a1d8f0a40989f77 SHA1 7fa1361be3ee110e3cc2e25a3bf16f0d6a35732a SHA256 0893195092c53e0793c53af72a4b196d9b1766765bdfe5d62bb40646bd312d05
+EBUILD gnutls-2.11.2.ebuild 2644 RMD160 1a0d6be8d2b6cb73b31085778a254f08d44a37d0 SHA1 58d930fa1fd727d09fc2ba410c012801dd088bf7 SHA256 92b867b1a9fd4a3da6846a9a529fbd67f641032f32fcdb74221d5a7d73cb26cc
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-MISC ChangeLog 39592 RMD160 e0fa8c03cee6f33737263f2545e24ca7f91cf084 SHA1 1669a9f08287aa2b6bfb65cea9e8ae01fab102cb SHA256 388173419a5bb6cf9159bca844b7c9135a0057d0c66a528ab870c27427018f36
+MISC ChangeLog 39771 RMD160 4a986d6238e64b043ca47703ab4ba282824cbc20 SHA1 5cbc291373decd278b22b1c7360072c62ddd68d9 SHA256 7444e4cbbacc418eb55f04eb2f8f8eb63bafec3e7210a5719e533a0f08e646b2
 MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyzjQIACgkQkKaRLQcq0GI+lACeOynHQUDtmU4GnERFVg1WReP8
-AT8AnikPLMyv9/M96mew5b4/ywWwi7m4
-=nU6z
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.11.2.ebuild b/net-libs/gnutls/gnutls-2.11.2.ebuild
new file mode 100644
index 000000000000..8eba3b5477df
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.11.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.11.2.ebuild,v 1.1 2010/10/16 00:11:43 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools 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
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+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 test zlib"
+
+# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile[networking] )
+	nettle? ( >=dev-libs/nettle-2.1[gmp] )
+	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
+	zlib? ( >=sys-libs/zlib-1.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*}"
+
+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() {
+	sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
+
+	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)"
+	econf --htmldir=/usr/share/doc/${P}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable guile) \
+		$(use_with !nettle libgcrypt) \
+		$(use_enable nls) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
+
+	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
+}