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

Package-Manager: portage-2.1.2-r7

diff --git a/net-misc/libupnp/ChangeLog b/net-misc/libupnp/ChangeLog
index a5308d283e9156ce34a7dfd45a1e96048914eaf6..89919621697aedd8a175f53fd8805203c1e2a002 100644 (file)
--- 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/Manifest b/net-misc/libupnp/Manifest
index 1d44da2e8350846291db814aa567e4a423b714da..1f5b4a20f6896b6f7ccef3c2490f8f3213c5ddc8 100644 (file)
--- a/net-misc/libupnp/Manifest
+++ b/net-misc/libupnp/Manifest
@@ -1,38 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libupnp-1.4.0-va_list.patch 572 RMD160 f81f903525b44f6ac6862802f8a865b437bda233 SHA1 19d01377c90c1f6a48848a75ac02b66aa44e8240 SHA256 2ae7708b78a67cc8c8a0b395fbb9a8b9aaf4e5e2b2cbc41cd4b83e3ceeda248f
-MD5 4ea48be87f64bf675636e6f26d2a0e3d files/libupnp-1.4.0-va_list.patch 572
-RMD160 f81f903525b44f6ac6862802f8a865b437bda233 files/libupnp-1.4.0-va_list.patch 572
-SHA256 2ae7708b78a67cc8c8a0b395fbb9a8b9aaf4e5e2b2cbc41cd4b83e3ceeda248f files/libupnp-1.4.0-va_list.patch 572
-DIST libupnp-1.4.0.tar.gz 763352 RMD160 4befe0d38bf4f2417328f4735a8ad4735d81fae4 SHA256 816c22d7163f2b74e7dab52b1adf81f5248d760da94fa79672337333a048e906
 DIST libupnp-1.4.1.tar.gz 1289149 RMD160 56f406160d030d5452710755bfd1b1ec606de3b3 SHA1 4c791fe92ec55cc49e406fbe02d6f8acd773c3bd SHA256 0c549192c00f5a494032a370ff1cc84f66b752cd756a0d7ba707ee4332137a8a
-EBUILD libupnp-1.4.0.ebuild 953 RMD160 4fc7727f751f8fcef4cfd9ae561550e516c277a7 SHA1 ced345a4b7cdfbf1f49d838594cacf4785c9dc1b SHA256 ec4be2ab349058d40758addec466d40bbdebf6bba0ad5a25398fee221aa8d4eb
-MD5 de28c2ed264c3220bf1f35af0fa026db libupnp-1.4.0.ebuild 953
-RMD160 4fc7727f751f8fcef4cfd9ae561550e516c277a7 libupnp-1.4.0.ebuild 953
-SHA256 ec4be2ab349058d40758addec466d40bbdebf6bba0ad5a25398fee221aa8d4eb libupnp-1.4.0.ebuild 953
-EBUILD libupnp-1.4.1.ebuild 845 RMD160 667daba4c3f1e01f4f69aa752e1badc7aa0df0d6 SHA1 046e6b49b451da51715595106aa6226b32c0ef54 SHA256 a3e9505e344ff154ae6590c2bfc6f57eb57d0644d877892dca03a165442f3ade
-MD5 154893bdb912409d1d6c20df9dfe589e libupnp-1.4.1.ebuild 845
-RMD160 667daba4c3f1e01f4f69aa752e1badc7aa0df0d6 libupnp-1.4.1.ebuild 845
-SHA256 a3e9505e344ff154ae6590c2bfc6f57eb57d0644d877892dca03a165442f3ade libupnp-1.4.1.ebuild 845
-MISC ChangeLog 576 RMD160 54417f5bcdd5934f9acad0ff933c5df5b50c49bf SHA1 372f8c0724166151fb973742bf531f6d610e110b SHA256 3eb3470383c8bae281a62cceb016d4cc6033b5b93474c4276b5a940bce9efc89
-MD5 f1b9d2bf57042d020bad44b5b62a39e1 ChangeLog 576
-RMD160 54417f5bcdd5934f9acad0ff933c5df5b50c49bf ChangeLog 576
-SHA256 3eb3470383c8bae281a62cceb016d4cc6033b5b93474c4276b5a940bce9efc89 ChangeLog 576
+EBUILD libupnp-1.4.1.ebuild 832 RMD160 b63293f3202ae7a7e7f051cafd8aa3149c14fc35 SHA1 a2259039f1a542629222d36d65582c3af283dd47 SHA256 08dfa308cc7e3750cd91bc696ae442f7201ab8f09141fa723e425c02724bc32b
+MD5 5465e727ba984e268e2ecd17b9b212de libupnp-1.4.1.ebuild 832
+RMD160 b63293f3202ae7a7e7f051cafd8aa3149c14fc35 libupnp-1.4.1.ebuild 832
+SHA256 08dfa308cc7e3750cd91bc696ae442f7201ab8f09141fa723e425c02724bc32b libupnp-1.4.1.ebuild 832
+MISC ChangeLog 776 RMD160 165ba91180f474266d1f1f5223dc700b6dd983a5 SHA1 56a17dd51d547a92558428efc29b4f411be42047 SHA256 4460e1b8c218ee73747b99824af018803a86c508e35a3fc2b522a89091f973b0
+MD5 cd3b02719923d0cf7b5822f62c6608c3 ChangeLog 776
+RMD160 165ba91180f474266d1f1f5223dc700b6dd983a5 ChangeLog 776
+SHA256 4460e1b8c218ee73747b99824af018803a86c508e35a3fc2b522a89091f973b0 ChangeLog 776
 MISC metadata.xml 328 RMD160 f308962cfa3170a17c8282b91990d3f2796ea69a SHA1 36afde39e4132faaf65d113401526ea92be3a5e0 SHA256 8fc4b28e4afce8ffd31932e1bd349c3b6642bd3c4cb343d364d3f8f385346ac9
 MD5 ab4917b0c655232761c5fe1c1198cfd6 metadata.xml 328
 RMD160 f308962cfa3170a17c8282b91990d3f2796ea69a metadata.xml 328
 SHA256 8fc4b28e4afce8ffd31932e1bd349c3b6642bd3c4cb343d364d3f8f385346ac9 metadata.xml 328
-MD5 611b5a279397941487c3d22ed049c20f files/digest-libupnp-1.4.0 241
-RMD160 426896b2d187b447b389c753416cfaf023ed3425 files/digest-libupnp-1.4.0 241
-SHA256 389f7ac4449bbb31129410169314c988d831bcf81885fcdc823bf477faf29966 files/digest-libupnp-1.4.0 241
 MD5 922221c432be47c5073b25fe012858a3 files/digest-libupnp-1.4.1 244
 RMD160 ac2ba9cc5b5d0ea0289aafabce6416cbf22d01f8 files/digest-libupnp-1.4.1 244
 SHA256 7d44d23f06146c4607324995a75b56338ab563fbf5fa73fe7108fdd56f171118 files/digest-libupnp-1.4.1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFHXD2amhnQswr0vIRAkrGAKCzj62b9/cC2UPbvUqptQJRaKNQ0gCgg5tH
-yd4hJ7bIRT2g6gREgAT1F1A=
-=D+4X
------END PGP SIGNATURE-----

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 (file)
index 18cbb13..0000000
--- 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 (file)
index 75f5c0a..0000000
--- 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,\r
-                 ... )\r
- {\r
--    va_list ArgList=NULL;\r
-+    va_list ArgList;\r
-     IXML_Document *out = NULL;\r
- \r
-     if( NumArg > 0 ) {\r
-@@ -387,7 +387,7 @@
-                         const char *Arg,\r
-                         ... )\r
- {\r
--    va_list ArgList=NULL;\r
-+    va_list ArgList;\r
-     IXML_Document *out = NULL;\r
- \r
-     if( NumArg > 0 ) {\r

diff --git a/net-misc/libupnp/libupnp-1.4.0.ebuild b/net-misc/libupnp/libupnp-1.4.0.ebuild
deleted file mode 100644 (file)
index 253ab1f..0000000
--- 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 90293b09051bc0c0d6f12977acf6a65605ed2aac..3696e65a6b4f98fc527330b850f553a22f6b1d9a 100644 (file)
--- 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
 }