Change berkdb and libosip deps wrt #218477, #206464, thanks to Peter Alfredsen and Weeve.

Package-Manager: portage-2.1.5_rc6

3 files changed, 25 insertions, 27 deletions

diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index a63bbd049234..54a4b6c8794b 100644
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/partysip
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.13 2007/01/04 16:37:51 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.14 2008/04/29 20:02:10 drac Exp $
+
+  29 Apr 2008; Samuli Suominen <drac@gentoo.org> partysip-2.2.3.ebuild:
+  Change berkdb and libosip deps wrt #218477, #206464, thanks to Peter
+  Alfredsen and Weeve.
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> partysip-2.2.3.ebuild:
   Fix broken autotools handling.
diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index a99bf2d80437..d754e0484ce8 100644
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -4,6 +4,6 @@ AUX partysip-2.2.3-libresolv-check.diff 612 RMD160 588771caca109ee8c33c6b1ab9140
 AUX partysip.confd 51 RMD160 8edc10e9ab0002f89746c14bd56c42eb509d798b SHA1 ba6d020b6e5146425108bb03a4dbdf541313549e SHA256 4ddd5228df78df69a5c73ea81f239056e7d176240228d34be3302fcab8c22420
 AUX partysip.rc6 556 RMD160 6b26f55e9dcb68634ca32d65e9bdaf63d453175d SHA1 b4328ea5357bdaaf06875362920085e241726244 SHA256 c8d96d78f5a3d601ac8983edc9229ef97a58196e4d8eed7612964f936daa5c08
 DIST partysip-2.2.3.tar.gz 568193 RMD160 31f24803488a86b00711c924f4327564e960e3b2 SHA1 140e8fc1dc7df52e8f409babebbaf4fcabe213aa SHA256 7f062e3f6e313189e11de7b4e4dd4162047c12f4671c78c121e731ebdf324950
-EBUILD partysip-2.2.3.ebuild 2090 RMD160 f3ec90a2ce237cc4796aa5d1950b9f79aaa63c38 SHA1 ecdfa6490741c96d92ff0dc3e8c0f83dd5a99f01 SHA256 6f399568d82e8c5d42aa57dcfd2ed885e1619eda0efee62b5a680c2bb260049f
-MISC ChangeLog 2351 RMD160 8a3d7e1c364c01854eece6014fff5f86f31f81b1 SHA1 971d39acb91fc77ab477383a515b92b9f0400d18 SHA256 afb77504340cb15946c242344c193e67d60174d7146172acf85c920ddf833af8
+EBUILD partysip-2.2.3.ebuild 2016 RMD160 0fa91fae9942ba200dbe6eaa90832849cc0f0251 SHA1 c01979bc5dde4eabfc2493c93c89cd587931cb55 SHA256 20fa9f4ce392df1fd590395b490333435314c0066cf049aabdfa103d9105fad3
+MISC ChangeLog 2513 RMD160 b64d3eaa6da31b251e15de26902b9f9d5566283c SHA1 e99337a854b38fe35caf81e8b368d327807f84a6 SHA256 e159f0128ad64bf965def92eb64e5786069226df24190200e85ad2e2cd0b6eaf
 MISC metadata.xml 217 RMD160 275af641d8134ee438c8e2c9f89eb3b0a286a386 SHA1 7b349815d56d7d7e2d46968341228c5267c666eb SHA256 c3eb09d27b1a9cf05b690524903c7faf096829ef1d19c0264769c277ac28d0a1
diff --git a/net-misc/partysip/partysip-2.2.3.ebuild b/net-misc/partysip/partysip-2.2.3.ebuild
index 57c540dcc9e4..ba993fc74aac 100644
--- a/net-misc/partysip/partysip-2.2.3.ebuild
+++ b/net-misc/partysip/partysip-2.2.3.ebuild
@@ -1,11 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.5 2007/01/04 16:37:51 flameeyes Exp $
-
-IUSE="berkdb debug syslog"
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.6 2008/04/29 20:02:10 drac Exp $
 
 inherit eutils autotools
 
@@ -13,29 +8,28 @@ 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
+SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86"
+IUSE="berkdb debug syslog"
 
-DEPEND="virtual/libc
-	>=net-libs/libosip-2.2.1
-	berkdb? ( =sys-libs/db-3* )"
+DEPEND="=net-libs/libosip-2*
+	berkdb? ( >=sys-libs/db-3.2 )"
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.diff
 
 	# fix libresolv check in configure.in (#107885)
 	# instead of res_query, we search for the real (internal)
 	# function name __res_query, because res_query isn't in the symbol
 	# list of libresolv on amd64
-	epatch ${FILESDIR}/${P}-libresolv-check.diff
+	epatch "${FILESDIR}"/${P}-libresolv-check.diff
 
 	# remove unused check in auth plugin (#107886)
 	# breaks authentication otherwise
-	epatch ${FILESDIR}/${P}-fix_auth.diff
+	epatch "${FILESDIR}"/${P}-fix_auth.diff
 
 	# put partysip	binary into /usr/sbin
 	sed -i -e "s:^bin_PROGRAMS:sbin_PROGRAMS:" \
@@ -69,20 +63,20 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	insinto /etc/partysip
 	doins conf/partysip.conf
 
-	chmod 750 ${D}etc/partysip
-	chmod 640 ${D}etc/partysip/partysip.conf
+	chmod 750 "${D}"etc/partysip
+	chmod 640 "${D}"etc/partysip/partysip.conf
 
-	newinitd ${FILESDIR}/partysip.rc6 partysip
-	newconfd ${FILESDIR}/partysip.confd partysip
+	newinitd "${FILESDIR}"/partysip.rc6 partysip
+	newconfd "${FILESDIR}"/partysip.confd partysip
 
-	dodoc README ChangeLog COPYING COPYING-2 TODO AUTHORS INSTALL NEWS
+	dodoc README ChangeLog TODO AUTHORS NEWS
 }
 
 pkg_postinst() {
-	einfo "Please edit /etc/partysip/partysip.conf!"
+	elog "Remember to edit /etc/partysip/partysip.conf!"
 }