Removed threads USE flag and hard-coded --enable-mt again as linphone will not build without threads support enabled in libosip (closing #99083), killed myconf var from src_compile and added missing dodoc in src_install.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 26 insertions, 31 deletions

diff --git a/net-libs/libosip/ChangeLog b/net-libs/libosip/ChangeLog
index 86e6b59ce3ab..ff5e41ada497 100644
--- a/net-libs/libosip/ChangeLog
+++ b/net-libs/libosip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libosip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.18 2005/07/14 18:49:32 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.19 2005/07/15 19:12:51 stkn Exp $
+
+  15 Jul 2005; Stefan Knoblich <stkn@gentoo.org> libosip-2.2.1.ebuild:
+  Removing threads USE flag and enabling threads support by default, breaks
+  linphone otherwise which needs libosip2 with threads support enabled (closing
+  #99083). Killed myconf variable from src_compile and added missing dodoc in
+  src_install.
 
 *libosip-2.2.1 (14 Jul 2005)
 
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index f5e54e8aad74..b7811d50548c 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28f1c7cffd12a5d0759f74918aafc446 libosip-0.9.6.ebuild 778
-MD5 383dd7b9e89de1f3c616acb8f59143a2 libosip-2.2.1.ebuild 903
-MD5 47f2b91416fca0c9dd42b5eb7799148d libosip-0.9.7.ebuild 543
-MD5 d2cb4ff0f6c2063bc610f0ce5e4f67ed ChangeLog 2719
+MD5 ac431a00e6d378b190d682af321e6618 libosip-0.9.6.ebuild 774
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 ba6341d2dad97a91cea39396b8534fcf ChangeLog 3039
+MD5 c0d8ab00ea6020885db60269c083c77f libosip-2.2.1.ebuild 815
+MD5 bef19142522b953ef2e7488cb01a82e3 libosip-0.9.7.ebuild 543
 MD5 bdae20c3d071939ffd92629f5d3c00f5 files/digest-libosip-0.9.6 65
-MD5 c31b44fd220e0d9aa00d0639d6a9ff9b files/digest-libosip-0.9.7 65
 MD5 5249f8f6a6158f8730e719f07b021acb files/digest-libosip-2.2.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1rNhz7mlh8wQzGMRAkirAJ9LRhPrOA0SK54rLknlIDRiZ7FingCgloLZ
-j/lJv66VwAwlUYUhF061QU4=
-=I6YT
------END PGP SIGNATURE-----
+MD5 c31b44fd220e0d9aa00d0639d6a9ff9b files/digest-libosip-0.9.7 65
diff --git a/net-libs/libosip/libosip-0.9.6.ebuild b/net-libs/libosip/libosip-0.9.6.ebuild
index a00264533b56..2b9e23b619fc 100644
--- a/net-libs/libosip/libosip-0.9.6.ebuild
+++ b/net-libs/libosip/libosip-0.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.6.ebuild,v 1.8 2004/07/15 01:10:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.6.ebuild,v 1.9 2005/07/15 19:12:51 stkn Exp $
 
 DESCRIPTION="This is the oSIP library (for Open SIP). It has been designed to provide the Internet Community a simple way to support the Session Initiation Protocol.  SIP is described in the RFC2543 which is available at http://www.ietf.org/rfc/rfc2543.txt."
 HOMEPAGE="http://www.linphone.org/?lang=us"
diff --git a/net-libs/libosip/libosip-0.9.7.ebuild b/net-libs/libosip/libosip-0.9.7.ebuild
index e8c81ce72692..948c7a8e8954 100644
--- a/net-libs/libosip/libosip-0.9.7.ebuild
+++ b/net-libs/libosip/libosip-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.7.ebuild,v 1.6 2004/08/08 15:32:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.7.ebuild,v 1.7 2005/07/15 19:12:51 stkn Exp $
 
 DESCRIPTION="GNU Open SIP (oSIP) library"
 HOMEPAGE="http://www.fsf.org/software/osip/"
diff --git a/net-libs/libosip/libosip-2.2.1.ebuild b/net-libs/libosip/libosip-2.2.1.ebuild
index 35f86a3563b2..e9763963e517 100644
--- a/net-libs/libosip/libosip-2.2.1.ebuild
+++ b/net-libs/libosip/libosip-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-2.2.1.ebuild,v 1.1 2005/07/14 18:49:32 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-2.2.1.ebuild,v 1.2 2005/07/15 19:12:51 stkn Exp $
 
-IUSE="debug threads"
+IUSE="debug"
 
 MY_MPV=${PV//.*}
 
@@ -16,21 +16,20 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="LGPL-2"
 
 DEPEND="virtual/libc"
-#		dev-util/gperf"
 
 src_compile() {
-	local myconf
-#	myconf="--enable-gperf \
-	myconf="--enable-md5 \
-			`use_enable threads mt` \
-			`use_enable debug`"
 
-	econf ${myconf} || die "Failed to econf"
+	econf \
+		--enable-md5 \
+		--enable-mt \
+		`use_enable debug` \
+		|| die "Failed to econf"
+
 	emake || die "Failed to emake"
 }
 
 src_install() {
 	einstall || die "Failed to einstall"
-	dodoc AUTHORS BUGS ChangeLog COPYING FEATURES HISTORY INSTALL NEWS README
-	TODO
+	dodoc AUTHORS BUGS ChangeLog COPYING FEATURES HISTORY INSTALL
+	dodoc README NEWS TODO
 }