Version bump (bug #292025).

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

3 files changed, 106 insertions, 6 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 3bb8b67d282e..96b4b976a7cf 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.245 2010/06/19 17:07:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.246 2010/06/25 21:37:29 arfrever Exp $
+
+*gnutls-2.10.0 (25 Jun 2010)
+
+  25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gnutls-2.6.6.ebuild, -gnutls-2.9.11.ebuild, +gnutls-2.10.0.ebuild:
+  Version bump (bug #292025).
 
   19 Jun 2010; Raúl Porcel <armin76@gentoo.org> gnutls-2.8.6.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #315781
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5702d7c2b0cf..51592d932373 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,13 +1,11 @@
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
-DIST gnutls-2.6.6.tar.bz2 5116385 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e
+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.8.6.tar.bz2 6469369 RMD160 1cfda29a60df3b032b8b611e4341c2e834bb26b2 SHA1 bff911d4fd7389aa6698a644b3748eb2d23715bc SHA256 d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
-DIST gnutls-2.9.11.tar.bz2 7439369 RMD160 312b0cbacb1e407d0fc119a3a9919a5d8a261e30 SHA1 16ee8e4ace64552e5aee4f35b8811e7187d31681 SHA256 3e4432d19440f9e9fae0893890df3e79ea69b564e4b463f2b217d61f363d1712
 DIST gnutls-2.9.12.tar.bz2 7441294 RMD160 baa6c300f819ecfced03c6a0ca18b5bb17b3d9b2 SHA1 40a451df94ef9969a219cb5054d292adcb6ca09e SHA256 8a1e9294010e755ce69538d39dc854cfeea3b710f6b53e372d9279f7be64bb99
-EBUILD gnutls-2.6.6.ebuild 2308 RMD160 61b3ccbbc81ede2805b4343170601af5107596ff SHA1 90c306b4221a31c2423fe96cc1a2dbfce9167293 SHA256 0070991bc9a4408ff8c907be124c3fcddf48e1bb7a08424df3fc587abddfe449
+EBUILD gnutls-2.10.0.ebuild 2515 RMD160 ce25fc959ee52480bcf872a02b07896650dba605 SHA1 6330e3a4fd612ad276dc99d23b6b8f8709a9e838 SHA256 849d8009854e8287d29c609b80628af9f7d9090d222e3a93f2a19c4a32b2f15f
 EBUILD gnutls-2.8.5.ebuild 2511 RMD160 58f2ca4f30cfa3979accdccff23bb798155b2167 SHA1 ceea0320720e458b3190405a9936bdc8cb93e837 SHA256 0b2c82e8ec49157f934314a94d850d00536b309f33e123eae30e6316befb3c6c
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-EBUILD gnutls-2.9.11.ebuild 2515 RMD160 40ac4eb81059c6cc3180f68ecdca0882c61dea73 SHA1 a4a4dc67cc31084ea3b0df9b6ac13e997b559f61 SHA256 51ebd5d50bf22d8d4b0f52c2e2b4d9dd5df685e8711bdff23f795e960e7e8942
 EBUILD gnutls-2.9.12.ebuild 2515 RMD160 38e3c413b65ea3a3cd9b90311fd602ead4dc02a9 SHA1 86896bed036517c43a7f6d2fe71266fde78fa40f SHA256 f5087cb1d3e031481a513ddef4a454a813442871bdfcad3e4c02d48cd30a01d7
-MISC ChangeLog 36869 RMD160 2cefa4b9f63705513149d547f83ef9da0e907e18 SHA1 27ea0ebd6ffa5f089648d77333e3d14a968fe83f SHA256 be27c39cb724564644928d9e29b6d71c2c7aeffe2eb75597ba9e3ee2120d6adb
+MISC ChangeLog 37074 RMD160 ec21845d509eaef88d774b58265aab9d3abe78fe SHA1 ebd59c02678fce066214f063722fef541e54d8dd SHA256 beaef8e4ad512031959daa4f0e24157fcd3d6527256d0d3e19f4683daa9d3a19
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/gnutls-2.10.0.ebuild b/net-libs/gnutls/gnutls-2.10.0.ebuild
new file mode 100644
index 000000000000..024a97fa1e73
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.10.0.ebuild
@@ -0,0 +1,96 @@
+# 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.10.0.ebuild,v 1.1 2010/06/25 21:37:29 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 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
+}