Version bump.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 107 insertions, 6 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 75fcb5467c93..07c9c320df77 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.251 2010/07/11 08:45:49 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.252 2010/07/22 20:13:14 arfrever Exp $
+
+*gnutls-2.11.0 (22 Jul 2010)
+
+  22 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gnutls-2.8.5.ebuild, -gnutls-2.9.12.ebuild, +gnutls-2.11.0.ebuild:
+  Version bump.
 
   11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> gnutls-2.10.0.ebuild:
   Stable on alpha, bug #292025
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1eb3ee42898a..9b78b9274b42 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,11 +1,9 @@
 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.8.5.tar.bz2 6196862 RMD160 f160b8b413ae7e0b9243135fd8ffd0dd350d1504 SHA1 5121c52efd4718ad3d8b641d28343b0c6abaa571 SHA256 9249c29df71551e302e0186f4e1876dd6cc4c6cf2974b432c22525dde815cae8
+DIST gnutls-2.11.0.tar.bz2 6692201 RMD160 a4fa542ae687aad27ca01466a2e70538e498dbbb SHA1 951d27dae2ab478d15e067ba1cda92b69c45ae31 SHA256 0298fb1b6ce30df46044d78cd719aa92b50c3537d83a82819aef4efb587997f5
 DIST gnutls-2.8.6.tar.bz2 6469369 RMD160 1cfda29a60df3b032b8b611e4341c2e834bb26b2 SHA1 bff911d4fd7389aa6698a644b3748eb2d23715bc SHA256 d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
-DIST gnutls-2.9.12.tar.bz2 7441294 RMD160 baa6c300f819ecfced03c6a0ca18b5bb17b3d9b2 SHA1 40a451df94ef9969a219cb5054d292adcb6ca09e SHA256 8a1e9294010e755ce69538d39dc854cfeea3b710f6b53e372d9279f7be64bb99
 EBUILD gnutls-2.10.0.ebuild 2510 RMD160 694bdec9bea6f73ba7345e96275fc2ad2772fc74 SHA1 f8541f47df985db7bacb932f20f888e32a990349 SHA256 33a60cdb197d20ca325c7a3881c434645428bd18abce498038c80477d9919536
-EBUILD gnutls-2.8.5.ebuild 2511 RMD160 58f2ca4f30cfa3979accdccff23bb798155b2167 SHA1 ceea0320720e458b3190405a9936bdc8cb93e837 SHA256 0b2c82e8ec49157f934314a94d850d00536b309f33e123eae30e6316befb3c6c
+EBUILD gnutls-2.11.0.ebuild 2578 RMD160 fc2961655b31b472be97ef37572ff34facd13828 SHA1 b9d550ea691f3de569cb7f20cdff522f3ff5e9f6 SHA256 23ce9ad7fc9cd9b1b076d4c637d44e2591abd69294108b3ac117cbacd54535cc
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-EBUILD gnutls-2.9.12.ebuild 2515 RMD160 38e3c413b65ea3a3cd9b90311fd602ead4dc02a9 SHA1 86896bed036517c43a7f6d2fe71266fde78fa40f SHA256 f5087cb1d3e031481a513ddef4a454a813442871bdfcad3e4c02d48cd30a01d7
-MISC ChangeLog 37610 RMD160 bb67a95182837e5a11ab084450344ea13531ba22 SHA1 8de75fb01929125da1988ec358745c85291c9e1a SHA256 45f40224304749b9208b6923b059cd9b9a67d359b3e8b589db68830d79f667f3
+MISC ChangeLog 37800 RMD160 ee76f5edd3eadce887693971b88d5020dd8df536 SHA1 cd6d92cceb7825b265c2c92a8f1ba2101d809c15 SHA256 e55d682ae586e05a82ae9643f6a562220624bf89304cb111fb956c09a1afd849
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/gnutls-2.11.0.ebuild b/net-libs/gnutls/gnutls-2.11.0.ebuild
new file mode 100644
index 000000000000..678de7d08549
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.11.0.ebuild
@@ -0,0 +1,97 @@
+# 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.0.ebuild,v 1.1 2010/07/22 20:13:14 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"
+		SRC_URI="ftp://ftp.gnutls.org/pub/${PN}/devel/${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 nls zlib"
+
+RDEPEND="dev-libs/libgpg-error
+	>=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile[networking] )
+	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_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
+}