Version bump.

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

3 files changed, 109 insertions, 3 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 247d2ed2a294..5999e9008d06 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.256 2010/09/14 21:17:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.257 2010/09/14 21:19:19 arfrever Exp $
+
+*gnutls-2.11.1 (14 Sep 2010)
+
+  14 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gnutls-2.11.1.ebuild:
+  Version bump.
 
   14 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   metadata.xml:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2fb71482d794..8fbde911d528 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,10 +2,12 @@ AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670
 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.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.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.ebuild 2515 RMD160 d9352590ce288deb9b13f2101f0578e63e259f7f SHA1 dd6153f8001ff7ee71fdbd8894cd1fad6b408a62 SHA256 b0b7a35abe89688c5381d47141b537b41fd413ad767c8580b3e7cc7dc14fd117
 EBUILD gnutls-2.11.0.ebuild 2578 RMD160 fc2961655b31b472be97ef37572ff34facd13828 SHA1 b9d550ea691f3de569cb7f20cdff522f3ff5e9f6 SHA256 23ce9ad7fc9cd9b1b076d4c637d44e2591abd69294108b3ac117cbacd54535cc
+EBUILD gnutls-2.11.1.ebuild 2642 RMD160 52d3e936c52445e32d4e7601a4f4fc303c2157cb SHA1 4ce33d645bbed1d1cfef9531388bb1646b87218f SHA256 e49b7525e5a4dd6c02c89d9b4f52a8e096d13347d304ff45da6d75c7dfbec86a
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-MISC ChangeLog 38163 RMD160 8ac948fcb95a19ebaf9dec1b93cf831c4f156176 SHA1 ae74dac99cd7ed32df20e3f0fe90bd1eb64a4408 SHA256 ef4ec1bca883063677d3f7c8118a5e3dee301384cc53f4fbb4eb9e5fbd2f98f9
-MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
+MISC ChangeLog 38428 RMD160 f2fdfa556a0d6be5152d8620634fb3dd6a3db206 SHA1 0a49ccc1e9cc6e050c908e429a325b028403a35a SHA256 74e7795f0f7a4ecd5c9a6345b66d4d078983cdd22897be1bb90ce2feb96c86ae
+MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
diff --git a/net-libs/gnutls/gnutls-2.11.1.ebuild b/net-libs/gnutls/gnutls-2.11.1.ebuild
new file mode 100644
index 000000000000..ee337e1b7bcf
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.11.1.ebuild
@@ -0,0 +1,98 @@
+# 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.1.ebuild,v 1.1 2010/09/14 21:19:19 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 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 )
+	!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 )"
+
+S="${WORKDIR}/${P%_pre*}"
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support was disabled for binary distribution of GnuTLS"
+		ewarn "due to licensing issues. See Bug #202381 for details."
+	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
+
+	elibtoolize # for sane .so versioning on FreeBSD
+}
+
+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
+}