Version bump.

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

3 files changed, 118 insertions, 6 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 07d7fc50eaac..284e6d92705a 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.292 2011/02/22 19:13:37 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.293 2011/02/28 22:53:48 arfrever Exp $
+
+*gnutls-2.10.5 (28 Feb 2011)
+
+  28 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gnutls-2.8.6.ebuild, -gnutls-2.10.1.ebuild, +gnutls-2.10.5.ebuild:
+  Version bump.
 
   22 Feb 2011; nixnut <nixnut@gentoo.org> gnutls-2.10.4.ebuild:
   ppc stable #352744
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 98087f4fcc49..230853aba13a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,20 +1,18 @@
-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.10.3.tar.bz2 6633204 RMD160 70566eab9cc9657fc5408525c0067352376b4c4f SHA1 b17b23d462ecf829f3b9aff3248d25d4979ebe4f SHA256 3576f28a3dbf979ce9df9f7ada6f346385e5950100dfbe9c9ac752cd330d54e6
 DIST gnutls-2.10.4.tar.bz2 7288167 RMD160 82c3722082a35292d99ccc8cb12023244506c9cf SHA1 f0dcd7b68748b48d7b945c52b6a9e64d643e4b58 SHA256 b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8
+DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.11.4.tar.bz2 7843686 RMD160 07a67f0c0e452619ed11c99bad7481d9374238f8 SHA1 1453de9b004640e6284dddaf47653c35324b36bc SHA256 1d13befbac6425a40ea945b199265e2b1391e5dc753b2c1e8f17a9b561f0e5cb
 DIST gnutls-2.11.5.tar.bz2 7009401 RMD160 1f110f18239d3eb1045389e1e599bcf0d864c847 SHA1 a9c4aba18d0b9facbcd36f54ce34a6442ccb57c9 SHA256 8f904019f35a6be15da9cedf4bb98fa9a8606dc1a54d724dbd2eba0467d7c244
 DIST gnutls-2.11.6.tar.bz2 7743287 RMD160 c3d7456cce6fcb77b0182d13a7127c90113deb9e SHA1 6abc6aa5636a2aa87071bbdeb29ab385ccf60a58 SHA256 4ea79c7a8c215f281994f81f9b8fc80787ac83f8b1c5ff2d89fc5eedd9502c3e
-DIST gnutls-2.8.6.tar.bz2 6469369 RMD160 1cfda29a60df3b032b8b611e4341c2e834bb26b2 SHA1 bff911d4fd7389aa6698a644b3748eb2d23715bc SHA256 d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
-EBUILD gnutls-2.10.1.ebuild 2508 RMD160 6cbaeebb8db55138199fae4462e372ffa5d3dc3a SHA1 b313a9ac66371e961b7a1d0b92e2dc644c12c82f SHA256 541059b15d37fb1c5d412d4efd54365d28ddd888431430f6a47d5e6d5243358d
 EBUILD gnutls-2.10.2-r1.ebuild 2860 RMD160 8a4ca5c7a841c13f163423b1d74b6c63009d77ae SHA1 bf435a9d1ea00143550833a59fe7bea6f13434dd SHA256 e6470b5e43d332c221e31109c2a8f561ca9b918d7ba29075612b031fdd18f7e0
 EBUILD gnutls-2.10.2.ebuild 2463 RMD160 6e153cad5b4cb11921680bbf0f220bf3e86a6004 SHA1 19118467f98d3043594d8cecf1c441ba64e6ccef SHA256 4f63937fa7a5f9bf8719e3f5df6ce410a35e00bc557e361121b023cde25ff46a
 EBUILD gnutls-2.10.3.ebuild 2658 RMD160 c58171d941dec9811a5b146ec7b3d0aa6d5af5b4 SHA1 40f782b1ad17f552d076acff45906bc3ac467c8d SHA256 d1e9cdfb702e5de3f6c8ffd7f248c33f7eba883fb9cc2236178e25f212884d8f
 EBUILD gnutls-2.10.4.ebuild 2833 RMD160 cc124e10348fa0be0193718f092dfd98be3a4637 SHA1 e46d1654b28e9e8a271fb5fcf875aadcc13d79b2 SHA256 39cd41e333727b8149caae67b305fc8448820d4f7c2bb8ab7c80f9c127e47f83
+EBUILD gnutls-2.10.5.ebuild 2846 RMD160 c8a8b61d0c6c5b0f722b853d65ead74b3a97715f SHA1 37751526daa60db244747476f253846baae119b0 SHA256 e0aa29cac983d121360034e5627e54d4b6cc5b8832e08a3b830507df6fb3abd7
 EBUILD gnutls-2.11.4-r1.ebuild 2991 RMD160 b5417234cbfd673b197247855be8563c0f39a9af SHA1 8dfb70fbcdca80862a111c41fdd98f729396929c SHA256 940b80f084a33741d00fdb7acbadfe131d0bd48695045704c8ee61b40ed09a05
 EBUILD gnutls-2.11.4.ebuild 2644 RMD160 8093e9b24c21e57a1e24ceb11e353e26983a3014 SHA1 ba63cd2383511953f597e4134b5be5d636fe73cf SHA256 c3a9287d481fce012f95d66367d3f4a18484bdd95923edb3dd2867f067776304
 EBUILD gnutls-2.11.5.ebuild 3009 RMD160 198879f91412e6be04e6666ed242cc6f45dc1dbc SHA1 6a48dfcea4f834b5175e47efe33ee3d7062ea244 SHA256 01939346e342afb8a3d86838062024bf7762da391c14f39c662d65c01e912e0e
 EBUILD gnutls-2.11.6.ebuild 3120 RMD160 4ac2752ad998c57634acd16fe95f5aa445ad82b0 SHA1 18890e66365aad1f972cb79066bea0d520e127f0 SHA256 2bccd8c39c84cc90d7d4058e843c9ea00d739d25a568c8f69347280c824c7740
-EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-MISC ChangeLog 43487 RMD160 1bb07df9848d74dea2f0449f62f6c8b165e7f8b8 SHA1 f75d5869c35504d57001c2e1583c96e571e78a37 SHA256 4e453dcfec708a8b50fb49b97e10a011fc306d13c71279fe94336b827a660889
+MISC ChangeLog 43679 RMD160 c25b1ef4fbe9453d46183ce10a1da189db766165 SHA1 c8fd45dba153b7e3df7410010f2fc0d63834f088 SHA256 86455850f151c9f4376295706c73245e6d5d1dd42c0b4aa4c68c6b9b57108436
 MISC metadata.xml 350 RMD160 5a195410cfec360554b39b5ed5af5ca9d983eb82 SHA1 6e5596d896b21ced6dfb8925be135dfaae2f98c6 SHA256 a8b8266694bd56790b5b568feabec29b705a9fc78a9fd260761ab14f0303f406
diff --git a/net-libs/gnutls/gnutls-2.10.5.ebuild b/net-libs/gnutls/gnutls-2.10.5.ebuild
new file mode 100644
index 000000000000..682cbc5335c4
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.10.5.ebuild
@@ -0,0 +1,108 @@
+# 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.10.5.ebuild,v 1.1 2011/02/28 22:53:48 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 nls test zlib"
+
+RDEPEND=">=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( >=dev-scheme/guile-1.8[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 )
+	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)"
+	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+
+	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_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() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
+		dohtml doc/gnutls.html || die "dohtml failed"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c || die "dodoc failed"
+	fi
+}