Version bump and removed old non-working version (#92831).

Package-Manager: portage-2.0.51.22-r1

9 files changed, 130 insertions, 151 deletions

diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index 454a2c71a3a9..929330b97827 100644
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/partysip
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.8 2004/10/23 02:18:38 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.9 2005/07/17 22:20:22 stkn Exp $
+
+*partysip-2.2.3 (18 Jul 2005)
+
+  18 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/partysip-2.1.1-libosip2fix.diff,
+  +files/partysip-2.2.3-configure.diff, files/partysip.rc6,
+  -partysip-2.1.1.ebuild, +partysip-2.2.3.ebuild:
+  Version bump and removed old non-working version (#92831).
 
   22 Oct 2004; Jason Wever <weeve@gentoo.org> partysip-2.1.1.ebuild:
   Added ~sparc keyword.
diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index 10b10ac34161..9928a2da8895 100644
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f51bd36a5d072d9dc49c6700b0502fca partysip-2.1.1.ebuild 1583
-MD5 6e47ae9f5e883ef74070ac1387d4b64b ChangeLog 1213
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 0293eef57b96944ba281314e53623dd1 files/partysip-2.1.1-libosip2fix.diff 1866
-MD5 2a6297d7481da765074b92d31c2f596e files/partysip.rc6 559
+MD5 d7f2eb10b40bc05622695571b12ef41e partysip-2.2.3.ebuild 1702
+MD5 e9dfc9e975db7001bf6a6b9efb806692 ChangeLog 1506
+MD5 28c1c4c474314301b9ae5a6df3bd96d8 files/digest-partysip-2.2.3 66
+MD5 683b0ac31fb45361c565e39861b10edb files/partysip-2.2.3-configure.diff 1121
+MD5 3d8b82c59417e2b2174a12728fe8ce10 files/partysip.rc6 556
 MD5 af1cd5cfc31c0ad22707ebfb4c5d4a42 files/partysip.confd 51
-MD5 3f15dc7dc0d0499a5b0ad25d6e592d3d files/digest-partysip-2.1.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpQR2I1lqEGTUzyQRAr7CAJ9qvrd7ZcPxm+FLHKg1sDF/n39EoACglHFQ
-kD1d2OR8GcFVysC09IxyIfM=
-=GT/+
------END PGP SIGNATURE-----
diff --git a/net-misc/partysip/files/digest-partysip-2.1.1 b/net-misc/partysip/files/digest-partysip-2.1.1
deleted file mode 100644
index 3d8dc4b998b7..000000000000
--- a/net-misc/partysip/files/digest-partysip-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 430b0a8caebeacabef102dbd4dfc7db5 partysip-2.1.1.tar.gz 588544
diff --git a/net-misc/partysip/files/digest-partysip-2.2.3 b/net-misc/partysip/files/digest-partysip-2.2.3
new file mode 100644
index 000000000000..ef4fa668192a
--- /dev/null
+++ b/net-misc/partysip/files/digest-partysip-2.2.3
@@ -0,0 +1 @@
+MD5 1deadef7455fce46a39b76d113f55a18 partysip-2.2.3.tar.gz 568193
diff --git a/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff b/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff
deleted file mode 100644
index 39b91dc6517e..000000000000
--- a/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-===================================================================
-RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/ppldso.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- partysip/partysip/ppl/unix/ppldso.c	2003/05/14 15:40:14	1.7
-+++ partysip/partysip/ppl/unix/ppldso.c	2004/02/13 18:50:24	1.8
-@@ -80,6 +80,7 @@
-  */
- 
- #include <ppl/ppl_dso.h>
-+#include <osipparser2/osip_port.h>
- 
- #if !defined(DSO_USE_DLFCN) && !defined(DSO_USE_SHL) && !defined(DSO_USE_DYLD)
- #error No DSO implementation specified.
-@@ -94,9 +95,6 @@
- #if HAVE_STRING_H
- #include <string.h>		/* for strerror() on HP-UX */
- #endif
--
--void *osip_malloc (int len);
--void osip_free (void *);
- 
- ppl_status_t
- ppl_dso_unload (ppl_dso_handle_t * thedso)
-===================================================================
-RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/pplgetopt.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- partysip/partysip/ppl/unix/pplgetopt.c	2003/05/14 15:40:14	1.7
-+++ partysip/partysip/ppl/unix/pplgetopt.c	2004/02/13 18:50:24	1.8
-@@ -53,9 +53,7 @@
-  */
- 
- #include <ppl/ppl_getopt.h>
--
--void *osip_malloc (int size);
--void osip_free (void *);
-+#include <osipparser2/osip_port.h>
- 
- #define EMSG    ""
-  
- /* This is a modified version from Aymeric MOIZARD
-===================================================================
-RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/pplpipe.c,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- partysip/partysip/ppl/unix/pplpipe.c	2004/01/30 23:44:45	1.8
-+++ partysip/partysip/ppl/unix/pplpipe.c	2004/02/13 18:50:24	1.9
-@@ -20,9 +20,8 @@
- 
- 
- #include <ppl/ppl_pipe.h>
-+#include <osipparser2/osip_port.h>
- 
--void *osip_malloc (int size);
--void osip_free (void *);
- 
- PPL_DECLARE (ppl_pipe_t *) ppl_pipe ()
- {
diff --git a/net-misc/partysip/files/partysip-2.2.3-configure.diff b/net-misc/partysip/files/partysip-2.2.3-configure.diff
new file mode 100644
index 000000000000..c643f32f7225
--- /dev/null
+++ b/net-misc/partysip/files/partysip-2.2.3-configure.diff
@@ -0,0 +1,34 @@
+--- partysip-2.2.3/configure.in.orig	2005-07-17 03:16:39.000000000 +0200
++++ partysip-2.2.3/configure.in	2005-07-17 03:17:16.000000000 +0200
+@@ -284,16 +284,16 @@
+ 				[PPL_LIB="$PPL_LIB -ldb"])])
+     ;;
+     susedb3)
+-	AC_CHECK_HEADERS(db3/db.h,[AC_CHECK_LIB(db,__db_ndbm_open,
+-				[PPL_LIB="$PPL_LIB -ldb"])])
++	AC_CHECK_HEADERS(db3/db.h,[AC_CHECK_LIB(db-3,__db_ndbm_open,
++				[PPL_LIB="$PPL_LIB -ldb-3"])])
+     ;;
+     susedb2)
+-	AC_CHECK_HEADERS(db2/db.h,[AC_CHECK_LIB(db,__db_ndbm_open,
+-				[PPL_LIB="$PPL_LIB -ldb"])])
++	AC_CHECK_HEADERS(db2/db.h,[AC_CHECK_LIB(db-2,__db_ndbm_open,
++				[PPL_LIB="$PPL_LIB -ldb-2"])])
+     ;;
+     susedb1)
+-	AC_CHECK_HEADERS(db1/db.h,[AC_CHECK_LIB(db,__db_ndbm_open,
+-				[PPL_LIB="$PPL_LIB -ldb"])])
++	AC_CHECK_HEADERS(db1/db.h,[AC_CHECK_LIB(db-1,__db_ndbm_open,
++				[PPL_LIB="$PPL_LIB -ldb-1"])])
+     ;;
+     dbm)
+ 	AC_CHECK_HEADERS(dbm.h,[AC_CHECK_LIB(dbm,dbm_open,
+@@ -301,7 +301,7 @@
+     ;;
+     gdbm)
+ 	AC_CHECK_HEADERS(gdbm-ndbm.h)
+-dnl	AC_CHECK_HEADERS(gdbm.h)
++	AC_CHECK_HEADERS(gdbm.h)
+ 	AC_CHECK_LIB(gdbm,dbm_open,[PPL_LIB="$PPL_LIB -lgdbm"])
+     ;;
+     ndbm)
diff --git a/net-misc/partysip/files/partysip.rc6 b/net-misc/partysip/files/partysip.rc6
index d988db12e496..9c6eb60e4b0b 100644
--- a/net-misc/partysip/files/partysip.rc6
+++ b/net-misc/partysip/files/partysip.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/files/partysip.rc6,v 1.2 2004/07/15 00:08:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/files/partysip.rc6,v 1.3 2005/07/17 22:20:22 stkn Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting partysip"
 	start-stop-daemon --start --background --pidfile /var/run/partysip.pid \
-		-m --quiet --exec /usr/bin/partysip -- ${PARTYSIP_OPTS}
+		-m --quiet --exec /usr/sbin/partysip -- ${PARTYSIP_OPTS}
 	eend $?
 }
 
diff --git a/net-misc/partysip/partysip-2.1.1.ebuild b/net-misc/partysip/partysip-2.1.1.ebuild
deleted file mode 100644
index a6f1ce5b05f6..000000000000
--- a/net-misc/partysip/partysip-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.1.1.ebuild,v 1.8 2004/10/23 02:18:38 weeve Exp $
-
-#IUSE="gdbm berkdb debug"
-IUSE="debug"
-
-inherit eutils
-
-DESCRIPTION="Modular and extensible SIP proxy"
-HOMEPAGE="http://savannah.nongnu.org/projects/partysip/"
-SRC_URI="http://osip.atosc.org/download/partysip/${P}.tar.gz"
-
-# disable automatic striping of libs and executables
-RESTRICT="nostrip"
-
-SLOT="0"
-LICENSE="LGPL-2" # not 100% about -2, but core is LGPL
-KEYWORDS="~x86 ~sparc"
-
-DEPEND="virtual/libc
-	>=net-libs/libosip-2.0.0"
-#	gdbm?   ( >=sys-libs/gdbm-1.8.0 )
-#	berkdb? ( >=sys-libs/db-4.1.20 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/partysip-2.1.1-libosip2fix.diff
-}
-
-src_compile() {
-	local myconf
-
-	use debug \
-		&& myconf="${myconf} --enable-debug --enable-trace" \
-		|| myconf="${myconf} --disable-debug --disable-trace"
-
-	# preference for berkdb...
-	# (doesn't work atm, looks like it's always trying to use ndbm)
-#	if use berkdb; then
-#		myconf="${myconf} --with-db=db"
-#	else
-#		use gdbm \
-#			&& myconf="${myconf} --with-db=gdbm"
-#	fi
-
-	econf \
-		--enable-semaphore \
-		--enable-sysv \
-		${myconf} || die
-	emake || die
-}
-
-src_install () {
-	emake DESTDIR=${D} install || die
-
-	insinto /etc/partysip
-	doins conf/partysip.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/partysip.rc6 partysip
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/partysip.confd partysip
-
-	dodoc README ChangeLog COPYING COPYING-2 TODO AUTHORS INSTALL NEWS
-}
diff --git a/net-misc/partysip/partysip-2.2.3.ebuild b/net-misc/partysip/partysip-2.2.3.ebuild
new file mode 100644
index 000000000000..45c435db7c7e
--- /dev/null
+++ b/net-misc/partysip/partysip-2.2.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.1 2005/07/17 22:20:22 stkn Exp $
+
+IUSE="berkdb debug syslog"
+
+inherit eutils
+
+DESCRIPTION="Modular and extensible SIP proxy"
+HOMEPAGE="http://savannah.nongnu.org/projects/partysip/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2" # not 100% about -2, but core is LGPL
+KEYWORDS="~x86 ~sparc"
+
+DEPEND="virtual/libc
+	>=net-libs/libosip-2.2.1
+	berkdb? ( =sys-libs/db-3* )"
+#	gdbm? ( sys-libs/gdbm )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-configure.diff
+
+	# put partysip  binary into /usr/sbin
+	sed -i -e "s:^bin_PROGRAMS:sbin_PROGRAMS:" \
+		src/Makefile.am tools/Makefile.am
+
+	# recreate configure
+	autoreconf
+	libtoolize --copy --force
+}
+
+src_compile() {
+	local myconf
+
+	# berkdb3 (preferred) / gdbm (no-worky) / no db...
+	if use berkdb; then
+		myconf="--with-db=susedb3"
+#	elif use gdbm; then
+#		myconf="--with-db=gdbm"
+	else
+		myconf="--with-db=no"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--enable-semaphore \
+		--enable-sysv \
+		`use_enable debug trace` \
+		`use_enable debug debug` \
+		`use_enable syslog` \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	insinto /etc/partysip
+	doins conf/partysip.conf
+
+	chmod 750 ${D}etc/partysip
+	chmod 640 ${D}etc/partysip/partysip.conf
+
+	newinitd ${FILESDIR}/partysip.rc6 partysip
+	newconfd ${FILESDIR}/partysip.confd partysip
+
+	dodoc README ChangeLog COPYING COPYING-2 TODO AUTHORS INSTALL NEWS
+}
+
+pkg_postinst() {
+	einfo "Please edit /etc/partysip/partysip.conf!"
+}