Bumping to version 1.4.5, contains FreeBSD fix and some other fixes.

(Portage version: 2.1.2.4)

7 files changed, 11 insertions, 106 deletions

diff --git a/net-misc/libupnp/ChangeLog b/net-misc/libupnp/ChangeLog
index da6766ce2b81..dd110ae0e3e0 100644
--- a/net-misc/libupnp/ChangeLog
+++ b/net-misc/libupnp/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-misc/libupnp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.12 2007/04/19 14:32:28 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/ChangeLog,v 1.13 2007/04/29 14:50:41 gurligebis Exp $
 
+  29 Apr 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org> -libupnp-1.4.4-r1.ebuild,
+  -libupnp-1.4.4.ebuild +libupnp-1.4.5.ebuild:
+  Bumping to version 1.4.5, contains FreeBSD fix and some other fixes.
+
+*libupnp-1.4.5 (29 Apr 2007)
+  
   19 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> libupnp-1.4.4-r1.ebuild:
   Keyworded ~x86-fbsd wrt bug #175201 and #175090
 
diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.4 b/net-misc/libupnp/files/digest-libupnp-1.4.4
deleted file mode 100644
index 75614e901e50..000000000000
--- a/net-misc/libupnp/files/digest-libupnp-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 79d2beeb7d78a5e080a52a7e321b7f22 libupnp-1.4.4.tar.bz2 1098948
-RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e libupnp-1.4.4.tar.bz2 1098948
-SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 libupnp-1.4.4.tar.bz2 1098948
diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.4-r1 b/net-misc/libupnp/files/digest-libupnp-1.4.4-r1
deleted file mode 100644
index 75614e901e50..000000000000
--- a/net-misc/libupnp/files/digest-libupnp-1.4.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 79d2beeb7d78a5e080a52a7e321b7f22 libupnp-1.4.4.tar.bz2 1098948
-RMD160 3d0edbf93935a5371c8e951b459d3e1d81278f7e libupnp-1.4.4.tar.bz2 1098948
-SHA256 72e2069cd2541e7c4b5c8e1f2e9b3d02cbd93e94bfbac23e97d50045a6899001 libupnp-1.4.4.tar.bz2 1098948
diff --git a/net-misc/libupnp/files/digest-libupnp-1.4.5 b/net-misc/libupnp/files/digest-libupnp-1.4.5
new file mode 100644
index 000000000000..1ae80852cd09
--- /dev/null
+++ b/net-misc/libupnp/files/digest-libupnp-1.4.5
@@ -0,0 +1,3 @@
+MD5 50b918b0d79bf4c7a9cd12b62b08fe96 libupnp-1.4.5.tar.bz2 1099659
+RMD160 33130b6020d34867b0b468f9efb80a8825d82074 libupnp-1.4.5.tar.bz2 1099659
+SHA256 ed4f8b267f471facbc83a015156c24b3355ac713774c55f4812b94118df30e4e libupnp-1.4.5.tar.bz2 1099659
diff --git a/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch b/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch
deleted file mode 100644
index 6009ddb3f144..000000000000
--- a/net-misc/libupnp/files/libupnp-1.4.4-r1-fbsd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- threadutil/inc/ithread.h.orig	2007-03-13 03:19:24 +0000
-+++ threadutil/inc/ithread.h	2007-04-18 19:54:22 +0000
-@@ -47,6 +47,10 @@
-  #include <unistd.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-+#endif
-+
- #ifdef PTHREAD_MUTEX_RECURSIVE
- /* This system has SuS2-compliant mutex attributes.
-  * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
---- upnp/src/genlib/net/uri/uri.c.orig	2007-04-18 20:46:43 +0000
-+++ upnp/src/genlib/net/uri/uri.c	2007-04-18 20:49:08 +0000
-@@ -34,8 +34,11 @@
- ************************************************************************/
- 
- #ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version < 601103
- #include <lwres/netdb.h>
- #endif
-+#endif
- #include "config.h"
- #include "uri.h"
- 
-@@ -620,7 +623,7 @@
-                                    &h,
-                                    temp_hostbyname_buff,
-                                    BUFFER_SIZE, &errcode );
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) && __FreeBSD_version < 601103
-         h = lwres_gethostbyname_r( temp_host_name,
-                                    &h_buf,
-                                    temp_hostbyname_buff,
---- configure.ac	(revision 157)
-+++ configure.ac	(working copy)
-@@ -163,13 +163,6 @@
- #
- # Default compilation flags
- #
--if test x"$enable_debug" = xyes; then
--	# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
--	:
--else
--	# add optimise for size
--	AX_CFLAGS_GCC_OPTION([-Os])
--fi
- AX_CFLAGS_WARN_ALL
- 
- #
-@@ -203,6 +196,7 @@
- AC_FUNC_VPRINTF
- AC_FUNC_FSEEKO
- 
-+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
- 
- #
- # Checks for POSIX Threads
diff --git a/net-misc/libupnp/libupnp-1.4.4.ebuild b/net-misc/libupnp/libupnp-1.4.4.ebuild
deleted file mode 100644
index 16f1ff4d13b0..000000000000
--- a/net-misc/libupnp/libupnp-1.4.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.4.ebuild,v 1.2 2007/04/17 18:43:03 gurligebis Exp $
-
-inherit eutils toolchain-funcs
-
-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"
-IUSE="debug"
-
-RDEPEND="!net-misc/upnp"
-
-src_compile() {
-	# w/o docdir to avoid sandbox violations	
-	econf \
-		$(use_enable debug) \
-		--without-docdir \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh
-}
-
-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-misc/libupnp/libupnp-1.4.4-r1.ebuild b/net-misc/libupnp/libupnp-1.4.5.ebuild
index 2163fe8ca333..e25a9a570780 100644
--- a/net-misc/libupnp/libupnp-1.4.4-r1.ebuild
+++ b/net-misc/libupnp/libupnp-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.2 2007/04/19 14:32:28 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libupnp/libupnp-1.4.5.ebuild,v 1.1 2007/04/29 14:50:41 gurligebis Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -21,8 +21,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-${PVR}-fbsd.patch
-
 	AT_M4DIR="m4" eautoreconf
 
 	# fix tests