fix sock support; remove old version

Package-Manager: portage-2.1.5_rc2

6 files changed, 18 insertions, 150 deletions

diff --git a/net-misc/neon/ChangeLog b/net-misc/neon/ChangeLog
index 6940cc8c31a1..4182f7448b93 100644
--- a/net-misc/neon/ChangeLog
+++ b/net-misc/neon/ChangeLog
@@ -1,6 +1,11 @@
 # 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.101 2008/03/23 11:42:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.102 2008/04/13 14:22:12 hollow Exp $
+
+  13 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/neon-0.27.2-linguas.patch, neon-0.26.4.ebuild, -neon-0.27.2.ebuild,
+  neon-0.28.1.ebuild:
+  fix sock support; remove old version
 
   23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> neon-0.28.1.ebuild:
   fix LINGUAS
diff --git a/net-misc/neon/Manifest b/net-misc/neon/Manifest
index f97d1dca211a..6fe22eb21893 100644
--- a/net-misc/neon/Manifest
+++ b/net-misc/neon/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX neon-0.27.2-linguas.patch 1538 RMD160 6a300538592ac0748b52b0e684031c1674aa0fb7 SHA1 30428e32ff2ebb064182ec6ce529027d71f4bd1c SHA256 d98f70b5b9134bd56a049f00bd05a77b12864d619ce8fe0d808f8d77a02d6a76
 DIST neon-0.26.4.tar.gz 794225 RMD160 7f1f63aa05b8b1329a88d95dca513af08f2d632d SHA1 0c005fe73573253888b0c6e839b18d24c52582a4 SHA256 92d9a9f097734e9baa542febae9419b0d22540e3158e245220fea1b078b159de
-DIST neon-0.27.2.tar.gz 812750 RMD160 71b8b328c13a61da873a2d87c2f19422d1afc6f9 SHA1 314cd05a269af3a4023dac252b604568f905f47c SHA256 021cb313c38b80a6bfcb97c10ddf06fa498d86bd07aacebd1bbee4532dd167bd
 DIST neon-0.28.1.tar.gz 796440 RMD160 7013320a95f5f5c26698ee82ca2d29cfb0a772bb SHA1 cf3859532a2ea5e00a6d657bf80a6d1533024860 SHA256 8a29457052b73ac0139e3b2824a74323256dd7631b1691239ddb18124e231a71
-EBUILD neon-0.26.4.ebuild 2489 RMD160 7e47c561d21fdf089c108a94828944c716d7b480 SHA1 fe7a8cb4666260845a670d85790d5a19148fcfdc SHA256 465bf3cadfca5ccd0689b06eb9b54969f032e99192ab46ad49746d2933ba636f
-EBUILD neon-0.27.2.ebuild 2649 RMD160 b1126aed80725edd2440c155aed265774e4b643c SHA1 5ca424525327cfc6004d24cdbabb4ea23c8540ba SHA256 be569dad60aaf5e95511caba31ee26dd573629fd34d589f3ea58be3db3f498c4
-EBUILD neon-0.28.1.ebuild 2933 RMD160 6b61529945e87750ff85a0c3db7898462cae9d31 SHA1 35f51b7f4671b66abe5e50899406e9694f2166fb SHA256 507c92d1de2f18356d178e941ffb4a8c0643bd5bf95602a52216cffab0741aa9
-MISC ChangeLog 13280 RMD160 5376fe66f6da9f1456c095042df6b714c93f28d9 SHA1 422a1aabfc53af662fdeeaaca515e02c18bc637b SHA256 589bdee88e821f044b5d83dafb713cfd4e00d1ff4b24fa305ffa7e7a011fb775
+EBUILD neon-0.26.4.ebuild 2487 RMD160 42453651d4a15ba0a66c1e07aff60dd9e42c4d88 SHA1 7dc0e65b2784afe255df9688f41ddcd03204207e SHA256 bf76f36bc40f2ddecaa0e5dec4008fc588361356330ad10217dced672bbbdc97
+EBUILD neon-0.28.1.ebuild 2942 RMD160 b63c86d64c7e955da7b037b4f81feb4d68153868 SHA1 ffe633e7ec2c2f01fc53cde45459ea3c14266630 SHA256 9e4b08a6212875d130b9ea299a81552b63260d4ed4de6c29b248c49981fb4a4c
+MISC ChangeLog 13469 RMD160 1f31233f630a22c0f7272cea2da9aaf001aa546e SHA1 829a141c96364f0148c82eab528c0d18da314e08 SHA256 ad58c71580723352e3bee936fb7f4637746bf47c430f29f6e11c8fd71c2ea0e5
 MISC metadata.xml 935 RMD160 7ae4517e5a208aed9239bfbe7874c4d50243e292 SHA1 4a73d8611ab7bab5174495734adc978c9d886c89 SHA256 b76402477f658a59c4fdb8596861560efeb5b144466e894fb6e8f7e49b8a9fa7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH7xAlj9hvisErhMIRAh9rAKCzMprvuZiCTRHg/5o2ti5EuIptbQCffLRp
-OjxCXSeJcC02IQZ2EfcT6G8=
-=rZwq
+iEYEARECAAYFAkgCFykACgkQmPFBzbX68WH6nwCfToJC2GLfI9IqjWaR1+kT38LG
+hu4An1yS1XEC8kPAljM0HgIXu7J4IPdB
+=d8Mp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/neon/files/neon-0.27.2-linguas.patch b/net-misc/neon/files/neon-0.27.2-linguas.patch
deleted file mode 100644
index 7560a2ce2797..000000000000
--- a/net-misc/neon/files/neon-0.27.2-linguas.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: neon-0.27.2/Makefile.in
-===================================================================
---- neon-0.27.2.orig/Makefile.in
-+++ neon-0.27.2/Makefile.in
-@@ -181,8 +181,10 @@ install-nls-no:
- 
- install-nls-yes:
- 	@for f in $(LINGUAS); do \
--	 $(INSTALL) -d $(DESTDIR)$(localedir)/$$f/LC_MESSAGES; \
--	 $(INSTALL_DATA) $(srcdir)/po/$$f.gmo $(DESTDIR)$(localedir)/$$f/LC_MESSAGES/neon.mo; \
-+	 if test -e $(srcdir)/po/$$f.gmo; then \
-+	  $(INSTALL) -d $(DESTDIR)$(localedir)/$$f/LC_MESSAGES; \
-+	  $(INSTALL_DATA) $(srcdir)/po/$$f.gmo $(DESTDIR)$(localedir)/$$f/LC_MESSAGES/neon.mo; \
-+	 fi \
- 	done
- 
- ChangeLog:
-@@ -191,15 +193,19 @@ ChangeLog:
- update-po:
- 	@xgettext $(XGETTEXT_OPTS) $(top_srcdir)/src/ne*.c -o $(POTFILE)
- 	@for f in $(LINGUAS); do \
--	 echo "> Updating \"$$f\" catalog:"; \
--	 $(MSGMERGE) --update $(top_srcdir)/po/$$f.po $(POTFILE); \
--	 $(MSGFMT) --output /dev/null --check-format $(top_srcdir)/po/$$f.po || exit 1; \
-+	 if test -e $(srcdir)/po/$$f.gmo; then \
-+	  echo "> Updating \"$$f\" catalog:"; \
-+	  $(MSGMERGE) --update $(top_srcdir)/po/$$f.po $(POTFILE); \
-+	  $(MSGFMT) --output /dev/null --check-format $(top_srcdir)/po/$$f.po || exit 1; \
-+	 fi \
- 	done
- 
- compile-gmo:
- 	@for f in $(LINGUAS); do \
--	 echo "> Compiling \"$$f\" catalog:"; \
--	 $(MSGFMT) --statistics -c -o po/$$f.gmo $(top_srcdir)/po/$$f.po; \
-+	 if test -e $(srcdir)/po/$$f.gmo; then \
-+	  echo "> Compiling \"$$f\" catalog:"; \
-+	  $(MSGFMT) --statistics -c -o po/$$f.gmo $(top_srcdir)/po/$$f.po; \
-+	 fi \
- 	done
- 
- doc-status:
diff --git a/net-misc/neon/neon-0.26.4.ebuild b/net-misc/neon/neon-0.26.4.ebuild
index 75579d580320..d545fd7c8815 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.8 2008/01/10 09:14:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.26.4.ebuild,v 1.9 2008/04/13 14:22:12 hollow Exp $
 
 inherit eutils libtool versionator autotools
 
@@ -53,7 +53,7 @@ src_compile() {
 		--enable-shared \
 		$(use_with zlib) \
 		$(use_with kerberos gssapi) \
-		$(use_enable socks5 socks) \
+		$(use_with socks5 socks) \
 		$(use_enable nls) \
 		${myconf} \
 		|| die "econf failed"
diff --git a/net-misc/neon/neon-0.27.2.ebuild b/net-misc/neon/neon-0.27.2.ebuild
deleted file mode 100644
index 70914b6ab7b5..000000000000
--- a/net-misc/neon/neon-0.27.2.ebuild
+++ /dev/null
@@ -1,92 +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.27.2.ebuild,v 1.2 2008/01/27 20:43:23 hollow Exp $
-
-inherit eutils libtool versionator autotools
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="expat kerberos nls socks5 ssl zlib"
-RESTRICT="test"
-
-DEPEND="expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	socks5? ( net-proxy/dante )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	zlib? ( sys-libs/zlib )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-linguas.patch
-	sed -i -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${LINGUAS}\"/g" \
-		./configure.in
-	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 ssl; then
-		myconf="${myconf} --with-ssl=openssl"
-	fi
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		$(use_with zlib) \
-		$(use_with kerberos gssapi) \
-		$(use_enable socks5 socks) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	make check || die "Trying make check without success."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die 'install failed'
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/*
-}
-
-pkg_postinst() {
-	ewarn "There are new features in this version; please beware that"
-	ewarn "upstream considers the socks support experimental.  If you"
-	ewarn "experience test failures (eg, bug 135863) then try rebuilding"
-	ewarn "glibc."
-	ewarn
-	ewarn "Neon has a policy of breaking API across versions, this means"
-	ewarn "that any packages that links against neon will 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 packages that have already been"
-	ewarn "ported to the new API."
-}
diff --git a/net-misc/neon/neon-0.28.1.ebuild b/net-misc/neon/neon-0.28.1.ebuild
index e968d69842f0..462a67574fdb 100644
--- a/net-misc/neon/neon-0.28.1.ebuild
+++ b/net-misc/neon/neon-0.28.1.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.28.1.ebuild,v 1.3 2008/03/30 03:55:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.28.1.ebuild,v 1.4 2008/04/13 14:22:12 hollow Exp $
 
 inherit autotools eutils libtool versionator
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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
@@ -74,7 +74,7 @@ src_compile() {
 		$(use_with kerberos gssapi) \
 		$(use_enable nls) \
 		$(use_with pkcs11 pakchois) \
-		$(use_enable socks5 socks) \
+		$(use_with socks5 socks) \
 		$(use_with zlib) \
 		${myconf}
 	emake || die "emake failed"