Version bump. Do not keepdir /var/run, bug #452222. Restrict libosip dependency as the package does not build against libosip-4.0.0.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

6 files changed, 69 insertions, 48 deletions

diff --git a/net-misc/siproxd/ChangeLog b/net-misc/siproxd/ChangeLog
index 16407b78eafc..9d17e5d1b043 100644
--- a/net-misc/siproxd/ChangeLog
+++ b/net-misc/siproxd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/siproxd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.24 2011/09/04 13:50:44 maekke Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.25 2013/03/20 17:19:50 chithanh Exp $
+
+*siproxd-0.8.1 (20 Mar 2013)
+
+  20 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/siproxd.rc7, +siproxd-0.8.1.ebuild, -files/siproxd-libtool-2.2.patch,
+  -siproxd-0.8.0-r1.ebuild, siproxd-0.8.0-r2.ebuild:
+  Version bump. Do not keepdir /var/run, bug #452222. Restrict libosip
+  dependency as the package does not build against libosip-4.0.0.
 
   04 Sep 2011; Markus Meier <maekke@gentoo.org> siproxd-0.8.0-r2.ebuild:
   x86 stable, bug #380807
@@ -100,4 +108,3 @@
   +files/siproxd-0.5.11-configure-docs.diff, +files/siproxd.rc6,
   +siproxd-0.5.11.ebuild:
   Initial import.
-
diff --git a/net-misc/siproxd/Manifest b/net-misc/siproxd/Manifest
index 4d435105a3a8..5b1478ed46ba 100644
--- a/net-misc/siproxd/Manifest
+++ b/net-misc/siproxd/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX siproxd-libtool-2.2.patch 369 RMD160 094f3c681f7bf0bad89ad2389325d3ba92892812 SHA1 4212f1f12347256152975d67e7e3c04a0fd39c92 SHA256 c9172450ea4853ec7efc8d1e941731afa18f619c8448ac8e8bbab8f441d83f82
-AUX siproxd-libtool-2.4.patch 412 RMD160 e6d9da36b4de7d8b260b19b6fdb08e3759d56551 SHA1 b3d7c8afee69c0f3625acf0d39967b376f15abfb SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc
-AUX siproxd.rc6 691 RMD160 42c969dc0d7306bb81b2f51eb4bf9b11a845470c SHA1 1565b7fad43cf0ead77ff7826478cb9500178f50 SHA256 b0e41722da2ce7b97abe2663d1b83fe764edd69c810d24708a8ab7f938811b26
-DIST siproxd-0.8.0.tar.gz 824404 RMD160 447bc8891632dc23a7685af8d2e958fb5ee9cfb2 SHA1 d2f23a01ea60e3648efd46136e02bc84d1e934a1 SHA256 1a0306dbf5dd65f2c6d779bd449cbabba8c1a4cc79ca034e9cc83836c60f8542
-EBUILD siproxd-0.8.0-r1.ebuild 3612 RMD160 75044e0c919c4ed1ddf702734f1a0856f94a1add SHA1 f668092c9dded52bb2765ab9c3ce0d29d55a901b SHA256 3a783c08e5220fa1af4f890fde330fe17bd12ccdf7122e93f276b8832f09a883
-EBUILD siproxd-0.8.0-r2.ebuild 3619 RMD160 dee69cd64af6f24d432266c99856a11eed2f0d43 SHA1 f18f4a60280e4b8b679145319de4089a4a30656e SHA256 3e834acaeb82514cc97a72693055f16afb795537b9487b181750dcab3511546f
-MISC ChangeLog 3709 RMD160 9fe8e3a2339ac7e2c43780c741240584958c260e SHA1 ed7e8890e277bce3cfd73e46ec40bd12c986b6b0 SHA256 d551fd51ff86e6c8080e71f9970e26f9287d0a5ee1c30a6aeb144230f3a21669
-MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5jgmoACgkQkKaRLQcq0GLJPQCfRpr0zPsbDior+FPTIEjAcL27
-NoAAoJffEySoQ880tkN5hMQ00NzfmS69
-=dWVk
------END PGP SIGNATURE-----
+AUX siproxd-libtool-2.4.patch 412 SHA256 3455d3a324758d2f719f515a5a1c7950fb605502c5af2d1cbd3cb49dace854bc SHA512 7ea24a99d65ecc8586473d49b7d485f27634c54290b23821313b1698bb495cf96db0b997d8cb48673a6291a538d5d31d1ee3089187c3d4f500727bc857de5f0c WHIRLPOOL 9bc6ea1b01c4726a6673535026ecba1fe2b21e2bcad459d689825445a1485e0f52d89034e8485b89560f89b28c7b3965db56bfa7237878640c45723b1159ceb9
+AUX siproxd.rc6 691 SHA256 b0e41722da2ce7b97abe2663d1b83fe764edd69c810d24708a8ab7f938811b26 SHA512 40fd7f0fa25d4e20a2a66456b516a6f1a1e139ba993696792c1f88e672860fca5f92966718b77ae2a253107d180dcacb3e12c026708a703cc6e93bd9729986a7 WHIRLPOOL 7e4136389a15be0024772ef1a38fff7031d4e787275172c91ab6dbd5e617df091ef3dbc63a0638715ed8f6a8714cbb216007e3fbfceb3a022cd0b01b99210520
+AUX siproxd.rc7 747 SHA256 9706ab45a36d7ae5ace552b73869c3506da4a4998aef1ef4eac62c671d1802ca SHA512 ffcf323ea2e934e5499a6e2826553c00a82bf9a8d95bccdf4737ec64acd79835d85ba040479ca42b2324ef554d747b6b238cb92b21f46840ff8d33d318b71a0f WHIRLPOOL d2b10ae886cd8f7491cfb1ed7a183e971131ba265b820bf0d16cf6ecaa967d76ad8ba2e8c81e29474065df48aa12c4c8e0a915eb925654f0b551e8672eb67bf0
+DIST siproxd-0.8.0.tar.gz 824404 SHA256 1a0306dbf5dd65f2c6d779bd449cbabba8c1a4cc79ca034e9cc83836c60f8542
+DIST siproxd-0.8.1.tar.gz 833170 SHA256 df2df04faf5bdb4980cbdfd5516a47898fc47ca1ebc2c628aa48305b20a09dad SHA512 b47c7b74b4d3adeb4fd9536f82c014a123a6fcbe508a4982c9e77e53a8c68b05bc32799f57cf749e860b3e1f19f6502dbea561a410975f9f095754748515964f WHIRLPOOL e70e79113af3fa0e0a00154c474ca89b7587202ef806c31df5fa9d79d2a813ba6fa3fa006fe8971bac5fed54b85540ae44116a8eb0c262a6bb29e5dcc3a4c612
+EBUILD siproxd-0.8.0-r2.ebuild 3646 SHA256 ddef8c0899d13d747e48a2b7844dd75073f8f929ab9e07dd59a88540d5572d7d SHA512 720fe2e08021ebae0d18cbf8fb61446f5565eecaf06cadec1c62a68a660f9e670a8441b8e2ae080cc1ea27169714f4e48e0889629a4d404a8b2605bf242c7a11 WHIRLPOOL 5cac6ee54b381640edc315990f27d44b187d72347c5c318c43a5107d198ff441f55fcbc5be0d6990bc08693e17843b9008a416eb128152f8646596469e23264f
+EBUILD siproxd-0.8.1.ebuild 3633 SHA256 6ef857b29cad3a28ece1d71036dbaae3d966e9ad208214d34bf5ac2515277f4d SHA512 d6352e471a7b2f8da52bcf15166df1ab6494dab52a20ea0a6be7140cd940f03b91d9bffbfc9f2b8af6bca1240ef24237b9fa59bc9f3810ec967d668b7b28b519 WHIRLPOOL 51e8e47bfc284b94f431e38f7e81fc49e922c45edce88c43f62049ac8ded207a5f4b3973b8ad2930a72dcfcf152eb12c5927a92c73ecc7b49cf0fd98d15866d7
+MISC ChangeLog 4079 SHA256 441a07f60cb84f6705d23b5cc798c3d6be7fe0c699d904ffaba061cfc87055ca SHA512 05679d1a8406a89f67cbfa2c2a2a573e758ebe21ecd0a414a80a47f5234105a19c3ab48a285e4e4067314ad765627d0d0834e5c3914eea05484b37544ad0a8be WHIRLPOOL e4c57020b810a913e4deb8a59e5ffbd1284cd3206b8206bdcb2fe982e15783b02f3bff9285079e65d3a2c4eab7275b1aaeb9c18954b5299a52b6414a95c594a9
+MISC metadata.xml 159 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d SHA512 7f16a333a56ea471ab46585ffe72378ef15805784a1a2cc98625db77be6548d2265dcd4267deabd67db9f63c21cfb86a25e6531747401cf15fd33b316e44c665 WHIRLPOOL 750d293fa390b8bbb6fc654ffc049670fa879605a4abdc5f1a87b0ed6942a9d9c95df732573c0287d192155a283067f5657cbf6162dd757a8cd7351d77ed9f2c
diff --git a/net-misc/siproxd/files/siproxd-libtool-2.2.patch b/net-misc/siproxd/files/siproxd-libtool-2.2.patch
deleted file mode 100644
index 6210ef0d7618..000000000000
--- a/net-misc/siproxd/files/siproxd-libtool-2.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U 2 a/src/plugins.h b/src/plugins.h
---- a/src/plugins.h	2010-01-07 12:44:38.000000000 +0100
-+++ b/src/plugins.h	2010-06-19 13:56:30.960679284 +0200
-@@ -25,4 +25,8 @@
- 
- 
-+#ifndef lt__PROGRAM__LTX_preloaded_symbols
-+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
-+#endif
-+
- /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */
- 
diff --git a/net-misc/siproxd/files/siproxd.rc7 b/net-misc/siproxd/files/siproxd.rc7
new file mode 100755
index 000000000000..b7eb2057448f
--- /dev/null
+++ b/net-misc/siproxd/files/siproxd.rc7
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/files/siproxd.rc7,v 1.1 2013/03/20 17:19:50 chithanh Exp $
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [[ ! -f /etc/siproxd.conf ]]; then
+		eerror "Please create /etc/siproxd.conf first!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	check_config || return 1
+	checkpath -q -d /var/run/siproxd -o siproxd:siproxd
+	ebegin "Starting siproxd"
+	start-stop-daemon --start --exec /usr/sbin/siproxd -- \
+		-p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping siproxd"
+	start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid
+	eend $?
+}
diff --git a/net-misc/siproxd/siproxd-0.8.0-r2.ebuild b/net-misc/siproxd/siproxd-0.8.0-r2.ebuild
index 981f818cf613..6387bd8305ff 100644
--- a/net-misc/siproxd/siproxd-0.8.0-r2.ebuild
+++ b/net-misc/siproxd/siproxd-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r2.ebuild,v 1.4 2011/09/04 13:50:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r2.ebuild,v 1.5 2013/03/20 17:19:50 chithanh Exp $
 
 EAPI="2"
 
@@ -17,7 +17,8 @@ IUSE="examples doc static"
 # TODO: debug can be used but dmalloc is breaking the build
 # upstream has been contacted, see bug 2649238 in their bugtracker
 
-RDEPEND=">=net-libs/libosip-3.0.0"
+RDEPEND=">=net-libs/libosip-3.0.0
+	<net-libs/libosip-4.0.0"
 #	debug? ( dev-libs/dmalloc[threads] )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.4
diff --git a/net-misc/siproxd/siproxd-0.8.0-r1.ebuild b/net-misc/siproxd/siproxd-0.8.1.ebuild
index 82ec5bf28ea5..d59091d652a5 100644
--- a/net-misc/siproxd/siproxd-0.8.0-r1.ebuild
+++ b/net-misc/siproxd/siproxd-0.8.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.0-r1.ebuild,v 1.4 2011/01/20 16:39:28 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.8.1.ebuild,v 1.1 2013/03/20 17:19:50 chithanh Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A proxy/masquerading daemon for the SIP protocol"
 HOMEPAGE="http://siproxd.sourceforge.net/"
@@ -12,15 +12,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples doc static"
 # TODO: debug can be used but dmalloc is breaking the build
 # upstream has been contacted, see bug 2649238 in their bugtracker
 
-RDEPEND=">=net-libs/libosip-3.0.0"
+RDEPEND=">=net-libs/libosip-3.0.0
+	<net-libs/libosip-4.0.0"
 #	debug? ( dev-libs/dmalloc[threads] )"
 DEPEND="${RDEPEND}
-	<sys-devel/libtool-2.4:2
+	>=sys-devel/libtool-2.4
 	doc? ( app-text/docbook-sgml-utils
 		app-text/docbook-sgml-dtd:4.2 )"
 # docbook-sgml-utils is for building doc
@@ -36,10 +37,12 @@ src_prepare() {
 	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example \
 		|| die "patching doc/siproxd.conf.example failed"
 	# do not fail when building with external libltdl
-	sed -i 's/libltdl //' Makefile.in Makefile.am || die "patching Makefile failed"
-	epatch "${FILESDIR}/${PN}-libtool-2.2.patch"
+	sed -i 's/libltdl //' Makefile.am || die "patching Makefile failed"
+	epatch "${FILESDIR}/${PN}-libtool-2.4.patch"
 	# do not crash when building with external libltdl, bug 308495
 	sed -i 's|"../libltdl/ltdl.h"|<ltdl.h>|' src/plugins.h || die "patching plugins.h failed"
+
+	eautoreconf
 }
 
 src_configure() {
@@ -69,7 +72,7 @@ src_configure() {
 src_install() {
 	einstall || die "einstall failed"
 
-	newinitd "${FILESDIR}"/${PN}.rc6 ${PN} || die "newinitd failed"
+	newinitd "${FILESDIR}"/${PN}.rc7 ${PN} || die "newinitd failed"
 
 	dodoc AUTHORS ChangeLog NEWS README RELNOTES TODO \
 		doc/FAQ doc/FLI4L_HOWTO.txt doc/KNOWN_BUGS \
@@ -81,7 +84,7 @@ src_install() {
 		# upstream has been contacted, see bug 2649333 in their bugtracker
 		dohtml -r doc/html/ || die "dohtml failed"
 		# pdf is not build all the time
-		if built_with_use app-text/docbook-sgml-utils jadetex; then
+		if has_version app-text/docbook-sgml-utils[jadetex]; then
 			dodoc doc/pdf/*.pdf || die "dodoc failed"
 		fi
 	fi
@@ -92,8 +95,8 @@ src_install() {
 	fi
 
 	# set up siproxd directories
-	keepdir /var/{lib,run}/${PN} || die "keepdir failed"
-	fowners siproxd:siproxd /var/{lib,run}/${PN} || die "fowners failed"
+	keepdir /var/lib/${PN} || die "keepdir failed"
+	fowners siproxd:siproxd /var/lib/${PN} || die "fowners failed"
 }
 
 pkg_postinst() {