Fixing bug #256843 and removing old ebuilds

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 33 insertions, 55 deletions

diff --git a/net-libs/libupnp/ChangeLog b/net-libs/libupnp/ChangeLog
index 2341f475a9c5..86e43e10e1cf 100644
--- a/net-libs/libupnp/ChangeLog
+++ b/net-libs/libupnp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libupnp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.22 2009/01/11 19:12:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.23 2009/01/31 17:04:20 gurligebis Exp $
+
+*libupnp-1.6.6-r1 (31 Jan 2009)
+
+  31 Jan 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +files/libupnp-1.6.6-patch-statevar-query.patch, -libupnp-1.4.6.ebuild,
+  -libupnp-1.6.5.ebuild, +libupnp-1.6.6-r1.ebuild:
+  Fixing bug #256843 and removing old ebuilds
 
   11 Jan 2009; Markus Meier <maekke@gentoo.org> libupnp-1.6.6.ebuild:
   amd64 stable, bug #239533
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index b57c5e205740..ec0adc85259e 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libupnp-1.4.6.tar.bz2 1100044 RMD160 022f867a7f4466dcaf1954a4643b7a32c4a7a95e SHA1 eb7d8c725f9813bcaff0eb6a8bc18e43f3c4bc77 SHA256 3d827c3eddd4fcb4fd08a0e9cfadaa9016314c4d2aed3e9f07d8307439d5aae1
-DIST libupnp-1.6.5.tar.bz2 1136968 RMD160 3eba250f3a425100ab76315de03afc7090f8705e SHA1 6e481b69a2ad7b3ab90e8b714e31dfe6698ed690 SHA256 95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
+AUX libupnp-1.6.6-patch-statevar-query.patch 600 RMD160 13cd0b19b7715d6106c66ecb8c050775101fa3c8 SHA1 241324470006905f685444621d588fcd8b4f4e99 SHA256 d6b48f2a221551fd9c6f76ef34201845c6aa1f2f462440c99e43e823512f686c
 DIST libupnp-1.6.6.tar.bz2 1146854 RMD160 25ff0390793cfa48cca32a335b4d633283b1fe64 SHA1 24c2c349cb52ed3d62121fbdae205c8d9dc0f5fa SHA256 58d7cabec2b21c80e28a4e5090bba94a849a8f02450e26c1b985318a36b0bbb3
-EBUILD libupnp-1.4.6.ebuild 1013 RMD160 ea61b9048f9da1a9bb02ddaebbd548432be510e1 SHA1 6b43bf6500754db1c814fbd926da42246261f997 SHA256 1d674d45918b1437d77afe3fcf360c109650627459e0ab08b3998d5ce0d44f62
-EBUILD libupnp-1.6.5.ebuild 1302 RMD160 2b399f03d3112dfd14f1e96d0127d7ef561effe2 SHA1 4db09bfbac396deeac513190e963fb2783a3447c SHA256 f887e52cdbe6c25e40ce7fbed6c50799d9973606595376e6e4d252253c984c83
+EBUILD libupnp-1.6.6-r1.ebuild 1365 RMD160 bf074d37ccfae617f8b928e17064aca85a200663 SHA1 aa04fb6efe09092b56ea28895046ab4914177b89 SHA256 b7072d0b47abf92a0f49831c36fc1e6c7aa498af7158b5e0fd3ce6429249e5d7
 EBUILD libupnp-1.6.6.ebuild 1296 RMD160 8756d82d9a4facc7d47b105f18addfd158282c24 SHA1 e7223c3ba9872c7baba721ce9dae31e448a31884 SHA256 fb4df6b28635d9e98545eb4d46073fefc10610e99fafaa58d31981f77597a315
-MISC ChangeLog 5061 RMD160 e39c0557aeec12bca3799cd56a37d9e939b6cfc4 SHA1 cf58a1220a1e9fd9b6acc1680af62b76b88689a3 SHA256 8669d9df41218688faf506c76892a3943b4e8055b8d2799fdd63b9eb39b22a03
+MISC ChangeLog 5332 RMD160 393397aa2b5646f563c900874fa20faa1f3ea720 SHA1 1393c22ab3e91d8c534059c1ab3c41840d9102fe SHA256 d37dcceed101b3cc7223381719339a606598d5ce21ce742bfb67f99c0e95418d
 MISC metadata.xml 358 RMD160 e6de7e13eaddafc6ff2f0c3fc2c6c8176d0cac5f SHA1 d50e7ab986bdb1fde3ef2dc28b2b95e6503f42b9 SHA256 1ca953c41f2eb0f236eab23dcf1e3777bf719995f12fc95c6ac2a341e1412e1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklqRIwACgkQkKaRLQcq0GLy2gCgi+bCyGQIkvK9VQTxCnJlO2zm
-R4YAoIIdEAemI+wjKIUPAc+9QjW5CjPw
-=qlI2
+iEYEARECAAYFAkmEoM8ACgkQsR7PQhRXYEntOwCfdtfxwc+mO2z8qHalcFQXu+M7
+EQoAmwcqVvWEp8tqjG72KxeZACIlRCXk
+=TC4K
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libupnp/files/libupnp-1.6.6-patch-statevar-query.patch b/net-libs/libupnp/files/libupnp-1.6.6-patch-statevar-query.patch
new file mode 100644
index 000000000000..28d02e6c5ce8
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.6-patch-statevar-query.patch
@@ -0,0 +1,14 @@
+diff -ru libupnp-1.6.6/upnp/src/soap/soap_ctrlpt.c libupnp-1.6.6-patched/upnp/src/soap/soap_ctrlpt.c
+--- libupnp-1.6.6/upnp/src/soap/soap_ctrlpt.c	2008-02-10 02:55:33.000000000 +0100
++++ libupnp-1.6.6-patched/upnp/src/soap/soap_ctrlpt.c	2009-01-29 21:09:41.000000000 +0100
+@@ -931,7 +931,7 @@
+     content_length = strlen( xml_start ) + strlen( var_name ) + strlen( xml_end );
+     if (http_MakeMessage(
+ 	&request, 1, 1,
+-	"Q" "sbc" "N" "s" "s" "Ucc" "sss",
++	"Q" "sbc" "N" "s" "sc" "Ucc" "sss",
+ 	SOAPMETHOD_POST, path.buf, path.length,
+ 	"HOST: ", host.buf, host.length,
+ 	content_length,
+
+ 	  	 
diff --git a/net-libs/libupnp/libupnp-1.4.6.ebuild b/net-libs/libupnp/libupnp-1.4.6.ebuild
deleted file mode 100644
index 253782250709..000000000000
--- a/net-libs/libupnp/libupnp-1.4.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.4.6.ebuild,v 1.8 2007/06/29 11:24:17 gurligebis Exp $
-
-WANT_AUTOMAKE=1.9
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	AT_M4DIR="m4" eautoreconf
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh
-}
-
-src_compile() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf \
-		$(use_enable debug) \
-		--without-docdir \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin upnp/.libs/upnp_tv_{ctrlpt,device}
-	dodoc NEWS README ChangeLog
-	dohtml upnp/doc/*.pdf
-}
diff --git a/net-libs/libupnp/libupnp-1.6.5.ebuild b/net-libs/libupnp/libupnp-1.6.6-r1.ebuild
index 3e22144678c4..4a4e5e2602ed 100644
--- a/net-libs/libupnp/libupnp-1.6.5.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.5.ebuild,v 1.3 2008/05/12 15:58:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.6-r1.ebuild,v 1.1 2009/01/31 17:04:20 gurligebis Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-patch-statevar-query.patch"
+
 	AT_M4DIR="m4" eautoreconf
 
 	# fix tests