Fixing bug #256843 and removing old ebuilds

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 27 insertions, 47 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/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