Fix bugs 164770 and 164768 thanks to Mark Charlebois <mcharleb@qualcomm.com>

(Portage version: 2.1.2-r7)

5 files changed, 10 insertions, 70 deletions

diff --git a/net-misc/libupnp/ChangeLog b/net-misc/libupnp/ChangeLog
index a5308d283e91..89919621697a 100644
--- a/net-misc/libupnp/ChangeLog
+++ b/net-misc/libupnp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/libupnp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.2 2006/09/29 19:15:33 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.3 2007/02/10 18:17:49 genstef Exp $
+
+  10 Feb 2007; <genstef@gentoo.org> -files/libupnp-1.4.0-va_list.patch,
+  -libupnp-1.4.0.ebuild, libupnp-1.4.1.ebuild:
+  Fix bugs 164770 and 164768 thanks to Mark Charlebois <mcharleb@qualcomm.com>
 
 *libupnp-1.4.1 (29 Sep 2006)
 
diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.0 b/net-misc/libupnp/files/digest-libupnp-1.4.0
deleted file mode 100644
index 18cbb13f9846..000000000000
--- a/net-misc/libupnp/files/digest-libupnp-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 581c8017dc1b36d29ba034ce1e178c83 libupnp-1.4.0.tar.gz 763352
-RMD160 4befe0d38bf4f2417328f4735a8ad4735d81fae4 libupnp-1.4.0.tar.gz 763352
-SHA256 816c22d7163f2b74e7dab52b1adf81f5248d760da94fa79672337333a048e906 libupnp-1.4.0.tar.gz 763352
diff --git a/net-misc/libupnp/files/libupnp-1.4.0-va_list.patch b/net-misc/libupnp/files/libupnp-1.4.0-va_list.patch
deleted file mode 100644
index 75f5c0a35371..000000000000
--- a/net-misc/libupnp/files/libupnp-1.4.0-va_list.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libupnp-1.4.0/upnp/src/api/upnptools.c	2006-06-06 07:37:44.000000000 +0200
-+++ patched_libupnp-1.4.0/upnp/src/api/upnptools.c	2006-07-01 14:31:31.000000000 +0200
-@@ -345,7 +345,7 @@
-                 const char *Arg,

-                 ... )

- {

--    va_list ArgList=NULL;

-+    va_list ArgList;

-     IXML_Document *out = NULL;

- 

-     if( NumArg > 0 ) {

-@@ -387,7 +387,7 @@
-                         const char *Arg,

-                         ... )

- {

--    va_list ArgList=NULL;

-+    va_list ArgList;

-     IXML_Document *out = NULL;

- 

-     if( NumArg > 0 ) {

diff --git a/net-misc/libupnp/libupnp-1.4.0.ebuild b/net-misc/libupnp/libupnp-1.4.0.ebuild
deleted file mode 100644
index 253ab1fb78da..000000000000
--- a/net-misc/libupnp/libupnp-1.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.0.ebuild,v 1.1 2006/07/01 18:38:25 genstef Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://www.virtualworlds.de/upnp/"
-SRC_URI="mirror://sourceforge/pupnp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-DEPEND="${RDEPEND}"
-RDEPEND="!net-misc/upnp
-		sys-fs/e2fsprogs"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix compile problems on amd64
-	epatch ${FILESDIR}/${P}-va_list.patch
-}
-
-src_compile() {
-	# 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"
-	
-	dodoc LICENSE NEWS README ChangeLog
-	dohtml upnp/doc/*.pdf
-}
-
diff --git a/net-misc/libupnp/libupnp-1.4.1.ebuild b/net-misc/libupnp/libupnp-1.4.1.ebuild
index 90293b09051b..3696e65a6b4f 100644
--- a/net-misc/libupnp/libupnp-1.4.1.ebuild
+++ b/net-misc/libupnp/libupnp-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.1.ebuild,v 1.1 2006/09/29 19:15:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.1.ebuild,v 1.2 2007/02/10 18:17:49 genstef Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="An Portable Open Source UPnP Development Kit"
 HOMEPAGE="http://pupnp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pupnp/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
@@ -26,7 +26,7 @@ src_compile() {
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin upnp/upnp_tv_ctrlpt upnp/upnp_tv_device || die
+	dobin upnp/.libs/upnp_tv_{ctrlpt,device}
 	dodoc NEWS README ChangeLog
 	dohtml upnp/doc/*.pdf
 }