Version bump.

Package-Manager: portage-14774-svn/cvs/Linux x86_64

3 files changed, 107 insertions, 12 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index e17bcfa9e2dc..41249b6a9a20 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.223 2009/10/28 22:00:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.224 2009/11/02 19:28:50 arfrever Exp $
+
+*gnutls-2.8.5 (02 Nov 2009)
+
+  02 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gnutls-2.8.5.ebuild:
+  Version bump.
 
   28 Oct 2009; Christian Faulhammer <fauli@gentoo.org> gnutls-2.8.4.ebuild:
   stable x86, bug 289625
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 8b1f0c4749f3..cc974be54ee6 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,23 +1,15 @@
------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.6.6.tar.bz2 5116385 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e
 DIST gnutls-2.8.3.tar.bz2 6198273 RMD160 01763fad93e4b76e18dcfb1881c5f09011804dca SHA1 c25fb354258777f9ee34b79b08eb87c024cada75 SHA256 f08f49d6f0df2618bb4f995e73d2e1fe0ae5a999939b38954b067111da7d7998
 DIST gnutls-2.8.4.tar.bz2 6193111 RMD160 f9236b3adf8ea3e747e1fb84d0ed19ae3294a522 SHA1 27bea240164b9287807543387682c7052f7318c2 SHA256 44a1f47b5df7a1ffc37b33801c7e529e380692d8c371a0f039b21698aab1b89c
+DIST gnutls-2.8.5.tar.bz2 6196862 RMD160 f160b8b413ae7e0b9243135fd8ffd0dd350d1504 SHA1 5121c52efd4718ad3d8b641d28343b0c6abaa571 SHA256 9249c29df71551e302e0186f4e1876dd6cc4c6cf2974b432c22525dde815cae8
 DIST gnutls-2.9.5.tar.bz2 6330386 RMD160 512f526118c2e15d25a3878aad55867ec4bd3321 SHA1 2777b0dcb11d23444d98f75b9c0aec216273fde4 SHA256 fa130235ee56fdee28f04a869a57a8e3e620b557b28ebbcc67a7496bef387ff2
 DIST gnutls-2.9.6.tar.bz2 6337312 RMD160 7ef2ade80052cc5c50b1f69ed54713d7a9b2e92f SHA1 ecd66f67b94d8f7eb2f20a408b7972ccd9db7130 SHA256 a158ed54c2fc354867f488ded4904d6f5dad2347c007e21a50a1901842850ea9
 EBUILD gnutls-2.6.6.ebuild 2308 RMD160 61b3ccbbc81ede2805b4343170601af5107596ff SHA1 90c306b4221a31c2423fe96cc1a2dbfce9167293 SHA256 0070991bc9a4408ff8c907be124c3fcddf48e1bb7a08424df3fc587abddfe449
 EBUILD gnutls-2.8.3.ebuild 2511 RMD160 31babf6a9dc6bd19434f0c17d8551c68eca73083 SHA1 901f9be6881ef514c3182b5c9a2177451e06acb2 SHA256 488846cede8d2631610855e028545a7b6bcc9e0fff58780c1a64d22b4cff1aa3
 EBUILD gnutls-2.8.4.ebuild 2519 RMD160 0f57a075534efb7763ae6bd62d5cf0c04d0b4e97 SHA1 4f594e07fb530a2f604b3e65eea7f17fb7f747f5 SHA256 9a00c432ee4506577f9ca22ac1ae7dbf30b76286b776c2793bf0f94fa43680c8
+EBUILD gnutls-2.8.5.ebuild 2524 RMD160 a1843923ec044b8003efa31a58dadeb73aab524d SHA1 637dc3a1d17a97427f484fefaef1226768314d60 SHA256 8229601047518febe9d5e08d019a71564870ed7a2efed9fec143e1309fe95195
 EBUILD gnutls-2.9.5.ebuild 2524 RMD160 d09f136ba43080e7992ace6b86638d2a7043f6f8 SHA1 c04a0395e2e5b2a22c959dd1ca65198c5a1bb00e SHA256 9909d97cbe5e6324a3b4eee53092d735033d60909ba32d9de25ed1882dcc78d9
 EBUILD gnutls-2.9.6.ebuild 2524 RMD160 f3f0d627e691652646adce0e3aceba716f392421 SHA1 de01500621e418eca86d09d6424c6c06bea0a3e4 SHA256 8c366c368ba78d78e8f4749f79ecda2c7d3526e6dd60a5c65c31961f5bac7a97
-MISC ChangeLog 34129 RMD160 9f27d0025a4dc548b6284ef5b21fafdfd4f24e05 SHA1 07973a5d592709afad8acd135e586e6f408aa3e3 SHA256 c4b76b1253de32cc729888e1ebb83e90beef0d467c558abfa8c0e938b35428e7
+MISC ChangeLog 34275 RMD160 bfeea61a15e2b504a16dd9db9683eadf64d6bed3 SHA1 8c8af3ee084b006aa61a636689bd90960df9e7e0 SHA256 1771abcc64f54a5702fe3a1b2a26430bacfbc065e3bb055996b6a1d4c3fcdb93
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrovu0ACgkQNQqtfCuFneNMawCfZ/HIn9ZkJpaCWUofsTjKAW9p
-s9IAmwTsgfl4MVGIAz05oqqYd+XXLMK5
-=fQUW
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.8.5.ebuild b/net-libs/gnutls/gnutls-2.8.5.ebuild
new file mode 100644
index 000000000000..5d0cdb67a641
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.8.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.5.ebuild,v 1.1 2009/11/02 19:28:50 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools libtool
+
+DESCRIPTION="A TLS 1.0 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."
+		epause 5
+	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
+}