Version bump. Fixed support for >=net-libs/gnutls-2.11.1[nettle] (bug #339393). Update dependencies (bug #341373).

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

3 files changed, 139 insertions, 2 deletions

diff --git a/net-libs/neon/ChangeLog b/net-libs/neon/ChangeLog
index aaeff86c2dae..a804b3f826a9 100644
--- a/net-libs/neon/ChangeLog
+++ b/net-libs/neon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/neon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/ChangeLog,v 1.15 2011/01/16 18:30:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/ChangeLog,v 1.16 2011/05/03 20:06:39 arfrever Exp $
+
+*neon-0.29.6 (03 May 2011)
+
+  03 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +neon-0.29.6.ebuild:
+  Version bump. Fixed support for >=net-libs/gnutls-2.11.1[nettle] (bug #339393).
+  Update dependencies (bug #341373).
 
   16 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   neon-0.29.5.ebuild:
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index f5376cb037b4..e4e670d52472 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST neon-0.29.5.tar.gz 884484 RMD160 4b6ede3f177f5b1ad7f8cdfcda7eee9215231bf6 SHA1 46e85922b2dad60f50393e7d8d4075c880c7e03e SHA256 dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290
+DIST neon-0.29.6.tar.gz 882267 RMD160 f2cd96ed659675812a97b99d1b54e3d8eb66e4ed SHA1 ae1109923303f67ed3421157927bc4bc29c58961 SHA256 9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43
 EBUILD neon-0.29.5.ebuild 2967 RMD160 320a82cb4adb3809d47fa5a740dda2598eb2e863 SHA1 3b363ce386804ba8b01b555f36fb3512660237bd SHA256 cf7b2ba0c373b5b517a755f2d356d1f54273ec569322bb4e53bf5620d32c9086
-MISC ChangeLog 21783 RMD160 357068dc18dd4f46345a92b03aeb6112660f777a SHA1 4c46943d2d8a5904db8b84cdb4faeea59b50745e SHA256 c1493473ca154d8de74fbfed1be104f4dae036056e34f7a79beaeb893b93e001
+EBUILD neon-0.29.6.ebuild 3086 RMD160 d123685af7fc23696cebc6068eb24880a5647d62 SHA1 9d23fc50198cfa44ce6e1834cfedd7b5b5970055 SHA256 1db2c3811c25360175960171553e8eb85b08d96299a9a0e852271a2a10a54b08
+MISC ChangeLog 22027 RMD160 7f0527f25adc6d8311b006b2321681ade7b2cf76 SHA1 b5a24e8f3fa77482eab1b8a464a85196fa51e39f SHA256 ca36a2582ad73743e14511c99f43724d58969d5f266e1818d1223968b12118c7
 MISC metadata.xml 1246 RMD160 e91ce5d57c9eacbbb186335d3dce3af0757983ce SHA1 2ec14ffda45b44d90f7871d568de5a83bf1fc43c SHA256 80b25fc6e55897725cdf3ad13701d01cc10dc4fdb14db8ba572ad4a3fc29f9f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNwGBbAAoJENgZr6v6gHY0TAUQAKv8twivowCyrqlMMvGJrbOc
+ObqKpJ1N+ezARzoXfmJ6hgG9srdr40Rs2HUg3gNv7FVNvwuumgnKkgQlWEWarsCz
+3NpNBYukQkmjI6reP/fl6+ar1VW1dBAYk1k/t9x1P/P2RBgsnQ2o9U8B527z1PpA
+8qnnNpadK4Cp66STMq5bQ3jOlXyM8kUCMJ1wU/SoRCPnsD7sqjRezwzEnyhpTUxa
+N8QziSx/g+WGiJSNtDXTb/E9+2wuWe4mHTaJk4UHXh06Lt6kG6fMSvogPe09neRu
+6n7GDRCcH9lJBEiA/UCeJsO9Ovv3v9JFVV30Pc4W6FcYnY7soyWPzzbJ1Nn1+wUm
+OTai6eKd0uSifTH7juyyj8tHo384ey29YM9TIGKUgPVlKg7BXVzMagOKMEilSesK
+rwVaBKLQRJLTk7VZc9D6uzLpvrUynj29oeYBxoVw6r7ALDPwvVVrXOh0QA9XRz3z
+mGTMmlsFoECOG4r+y30vJ/oT+evgyZZCNt/5NbpQ9sABCj7cd3PYRIOBB0LFePqx
+x+xqqRwfBKgfRq87Wy/HOjrL9Pme0NYEKvPnoiJXVdo81k5qGkPzi5YFlALC3dj4
+h7El+xddsBVbSX4Y4Hlka6HGIursfTGVeDL6e86xEjaaIBexrGGa7AmJthYIZoi9
+R1Ye44QO1alBqux3/+pc
+=bZYJ
+-----END PGP SIGNATURE-----
diff --git a/net-libs/neon/neon-0.29.6.ebuild b/net-libs/neon/neon-0.29.6.ebuild
new file mode 100644
index 000000000000..b982e402558a
--- /dev/null
+++ b/net-libs/neon/neon-0.29.6.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/neon/neon-0.29.6.ebuild,v 1.1 2011/05/03 20:06:39 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools libtool versionator
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2 )
+	gnutls? (
+		app-misc/ca-certificates
+		>=net-libs/gnutls-2.0
+		pkcs11? ( dev-libs/pakchois )
+	)
+	!gnutls? ( ssl? (
+		>=dev-libs/openssl-0.9.6f
+		pkcs11? ( dev-libs/pakchois )
+	) )
+	kerberos? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	nls? ( virtual/libintl )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	local lingua linguas
+	for lingua in ${IUSE_LINGUAS}; do
+		use linguas_${lingua} && linguas+=" ${lingua}"
+	done
+	sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in
+
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=" --enable-threadsafe-ssl=posix"
+	fi
+
+	if use expat; then
+		myconf+=" --with-expat"
+	else
+		myconf+=" --with-libxml2"
+	fi
+
+	if use gnutls; then
+		myconf+=" --with-ssl=gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+	elif use ssl; then
+		myconf+=" --with-ssl=openssl"
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-lib install-headers install-config install-nls || die "emake install failed"
+
+	find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
+
+	if use doc; then
+		emake DESTDIR="${D}" install-docs || die "emake install-docs failed"
+	fi
+
+	dodoc AUTHORS BUGS NEWS README THANKS TODO
+	doman doc/man/*.[1-8]
+}
+
+pkg_postinst() {
+	ewarn "Neon has a policy of breaking API across minor versions, this means"
+	ewarn "that any package that links against Neon may be broken after"
+	ewarn "updating. They will remain broken until they are ported to the"
+	ewarn "new API. You can downgrade Neon to the previous version by doing:"
+	ewarn
+	ewarn "  emerge --oneshot '<${CATEGORY}/${PN}-$(get_version_component_range 1-2 ${PV})'"
+	ewarn
+	ewarn "You may also have to downgrade any package that has not been"
+	ewarn "ported to the new API yet."
+}