fix #219888

(Portage version: 2.1.5.2)

3 files changed, 10 insertions, 112 deletions

diff --git a/net-misc/neon/ChangeLog b/net-misc/neon/ChangeLog
index ed348dc6a670..db24892bddb9 100644
--- a/net-misc/neon/ChangeLog
+++ b/net-misc/neon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/neon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.105 2008/04/19 09:38:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.106 2008/06/01 12:08:15 hollow Exp $
+
+  01 Jun 2008; Benedikt Böhm <hollow@gentoo.org> neon-0.26.4.ebuild,
+  -neon-0.28.1.ebuild:
+  fix #219888
 
   19 Apr 2008; Benedikt Böhm <hollow@gentoo.org> neon-0.28.1.ebuild,
   neon-0.28.2.ebuild:
diff --git a/net-misc/neon/neon-0.26.4.ebuild b/net-misc/neon/neon-0.26.4.ebuild
index d545fd7c8815..506b5a6c5395 100644
--- a/net-misc/neon/neon-0.26.4.ebuild
+++ b/net-misc/neon/neon-0.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.26.4.ebuild,v 1.9 2008/04/13 14:22:12 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.26.4.ebuild,v 1.10 2008/06/01 12:08:15 hollow Exp $
 
 inherit eutils libtool versionator autotools
 
@@ -24,7 +24,10 @@ DEPEND="expat? ( dev-libs/expat )
 
 src_unpack() {
 	unpack ${A}
-	elibtoolize
+	cd "${S}"
+
+	sed -i -e "s/socks5/socks/g" macros/neon.m4
+	AT_M4DIR="macros" eautoreconf
 }
 
 src_compile() {
diff --git a/net-misc/neon/neon-0.28.1.ebuild b/net-misc/neon/neon-0.28.1.ebuild
deleted file mode 100644
index 9c57ca8b90b1..000000000000
--- a/net-misc/neon/neon-0.28.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.28.1.ebuild,v 1.6 2008/04/19 09:38:13 hollow Exp $
-
-inherit autotools eutils libtool versionator
-
-RESTRICT="test"
-
-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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc expat gnutls kerberos nls pkcs11 socks5 ssl zlib"
-IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
-for lingua in ${IUSE_LINGUAS}; do
-	IUSE="${IUSE} linguas_${lingua}"
-done
-
-RDEPEND="expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	gnutls? (
-		>=net-libs/gnutls-2.0
-		pkcs11? ( dev-libs/pakchois )
-	)
-	!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f ) )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	socks5? ( net-proxy/dante )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local lingua linguas
-	for lingua in ${IUSE_LINGUAS}; do
-		use linguas_${lingua} && linguas="${linguas} ${lingua}"
-	done
-	sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/g" configure.in
-	sed -i -e "s/socks5/socks/g" macros/neon.m4
-
-	AT_M4DIR="macros" eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if has_version sys-libs/glibc; then
-		if built_with_use --missing true sys-libs/glibc nptlonly \
-			|| built_with_use --missing true sys-libs/glibc nptl; then
-			einfo "Enabling SSL library thread-safety using POSIX threads..."
-			myconf="${myconf} --enable-threadsafe-ssl=posix"
-		fi
-	fi
-
-	if use expat; then
-		myconf="${myconf} --with-expat"
-	else
-		myconf="${myconf} --with-libxml2"
-	fi
-
-	if use gnutls; then
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		myconf="${myconf} --with-ssl=openssl"
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_with pkcs11 pakchois) \
-		$(use_with socks5 socks) \
-		$(use_with zlib) \
-		${myconf}
-	emake || die "emake failed"
-}
-
-src_test() {
-	emake check || die "Trying make check without success."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-lib install-headers install-config install-nls || die "emake install failed"
-
-	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 '<net-misc/neon-$(get_version_component_range 1-2 ${PV})'"
-	ewarn
-	ewarn "You may also have to downgrade any package that has already been"
-	ewarn "ported to the new API."
-}