Bumping to latest version

(Portage version: 2.0.51.22-r1)

11 files changed, 46 insertions, 112 deletions

diff --git a/net-libs/libosip/ChangeLog b/net-libs/libosip/ChangeLog
index 2c60629fbb45..86e6b59ce3ab 100644
--- a/net-libs/libosip/ChangeLog
+++ b/net-libs/libosip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libosip
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.17 2004/12/29 03:19:51 ciaranm Exp $
+# 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 $
+
+*libosip-2.2.1 (14 Jul 2005)
+
+  14 Jul 2005; John Mylchreest <johnm@gentoo.org> -libosip-0.8.8.ebuild,
+  -libosip-0.8.8-r1.ebuild, -libosip-2.0.6.ebuild, -libosip-2.0.7.ebuild,
+  +libosip-2.2.1.ebuild:
+  Bumping to latest version.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-libs/libosip/files/digest-libosip-0.8.8 b/net-libs/libosip/files/digest-libosip-0.8.8
deleted file mode 100644
index a161939934f0..000000000000
--- a/net-libs/libosip/files/digest-libosip-0.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 840b5508eec9ae7fae998059b7bf63eb libosip-0.8.8.tar.gz 382002
diff --git a/net-libs/libosip/files/digest-libosip-0.8.8-r1 b/net-libs/libosip/files/digest-libosip-0.8.8-r1
deleted file mode 100644
index a161939934f0..000000000000
--- a/net-libs/libosip/files/digest-libosip-0.8.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 840b5508eec9ae7fae998059b7bf63eb libosip-0.8.8.tar.gz 382002
diff --git a/net-libs/libosip/files/digest-libosip-2.0.6 b/net-libs/libosip/files/digest-libosip-2.0.6
deleted file mode 100644
index bdbf1834a380..000000000000
--- a/net-libs/libosip/files/digest-libosip-2.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d37b110f7cf1feba30f75b8b321f6555 libosip2-2.0.6.tar.gz 591834
diff --git a/net-libs/libosip/files/digest-libosip-2.0.7 b/net-libs/libosip/files/digest-libosip-2.0.7
deleted file mode 100644
index 05a49a99e422..000000000000
--- a/net-libs/libosip/files/digest-libosip-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a3edb990a3fe096ac7d53b457cdbb46 libosip2-2.0.7.tar.gz 597013
diff --git a/net-libs/libosip/files/digest-libosip-2.2.1 b/net-libs/libosip/files/digest-libosip-2.2.1
new file mode 100644
index 000000000000..c37fc9222fd5
--- /dev/null
+++ b/net-libs/libosip/files/digest-libosip-2.2.1
@@ -0,0 +1 @@
+MD5 6daf22ab1d814f3d601147ee75e25170 libosip2-2.2.1.tar.gz 644055
diff --git a/net-libs/libosip/libosip-0.8.8-r1.ebuild b/net-libs/libosip/libosip-0.8.8-r1.ebuild
deleted file mode 100644
index 01d2ddd2593b..000000000000
--- a/net-libs/libosip/libosip-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.8.8-r1.ebuild,v 1.6 2004/07/15 01:10:57 agriffis 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"
-SRC_URI="http://www.linphone.org/download/${P}.tar.gz"
-
-SLOT="1"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-libs/libosip/libosip-0.8.8.ebuild b/net-libs/libosip/libosip-0.8.8.ebuild
deleted file mode 100644
index afbd6b595d1a..000000000000
--- a/net-libs/libosip/libosip-0.8.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.8.8.ebuild,v 1.9 2004/07/15 01:10:57 agriffis 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"
-SRC_URI="http://www.linphone.org/download/${P}.tar.gz"
-
-SLOT="1"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-libs/libosip/libosip-2.0.6.ebuild b/net-libs/libosip/libosip-2.0.6.ebuild
deleted file mode 100644
index 12e37d1634a4..000000000000
--- a/net-libs/libosip/libosip-2.0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-2.0.6.ebuild,v 1.4 2004/07/15 01:10:57 agriffis Exp $
-
-IUSE="debug"
-
-DESCRIPTION="GNU oSIP (Open SIP) library version 2"
-HOMEPAGE="http://www.gnu.org/software/osip/"
-SRC_URI="http://osip.atosc.org/download/osip/libosip2-${PV}.tar.gz"
-S="${WORKDIR}/libosip2-${PV}"
-
-SLOT="2"
-KEYWORDS="~x86"
-LICENSE="LGPL-2"
-
-DEPEND="virtual/libc
-	dev-util/gperf"
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-gperf --enable-mt --enable-md5"
-
-	use debug && \
-		myconf="${myconf} --enable-debug"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc README ChangeLog INSTALL AUTHORS COPYING NEWS BUGS TODO
-}
diff --git a/net-libs/libosip/libosip-2.0.7.ebuild b/net-libs/libosip/libosip-2.0.7.ebuild
deleted file mode 100644
index 069d18a7c7dc..000000000000
--- a/net-libs/libosip/libosip-2.0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-2.0.7.ebuild,v 1.7 2004/10/31 20:47:05 kloeri Exp $
-
-IUSE="debug"
-
-DESCRIPTION="GNU oSIP (Open SIP) library version 2"
-HOMEPAGE="http://www.gnu.org/software/osip/"
-SRC_URI="mirror://gnu/osip/libosip2-${PV}.tar.gz"
-S="${WORKDIR}/libosip2-${PV}"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="LGPL-2"
-
-DEPEND="virtual/libc
-	dev-util/gperf"
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-gperf --enable-mt --enable-md5"
-
-	use debug && \
-		myconf="${myconf} --enable-debug"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc README ChangeLog INSTALL AUTHORS COPYING NEWS BUGS TODO
-}
diff --git a/net-libs/libosip/libosip-2.2.1.ebuild b/net-libs/libosip/libosip-2.2.1.ebuild
new file mode 100644
index 000000000000..35f86a3563b2
--- /dev/null
+++ b/net-libs/libosip/libosip-2.2.1.ebuild
@@ -0,0 +1,36 @@
+# 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 $
+
+IUSE="debug threads"
+
+MY_MPV=${PV//.*}
+
+DESCRIPTION="GNU oSIP (Open SIP) library version 2"
+HOMEPAGE="http://www.gnu.org/software/osip/"
+SRC_URI="mirror://gnu/osip/libosip2-${PV}.tar.gz"
+S="${WORKDIR}/${PN}${MY_MPV}-${PV}"
+
+SLOT="${MY_MPV}"
+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"
+	emake || die "Failed to emake"
+}
+
+src_install() {
+	einstall || die "Failed to einstall"
+	dodoc AUTHORS BUGS ChangeLog COPYING FEATURES HISTORY INSTALL NEWS README
+	TODO
+}