Correct doc dependencies and split init script in 3: kannel-{bearerbox,smsbox,wapbox} (#285246).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 146 insertions, 22 deletions

diff --git a/app-mobilephone/kannel/ChangeLog b/app-mobilephone/kannel/ChangeLog
index 82ac47bc6b2c..f9ce4fb4a9f0 100644
--- a/app-mobilephone/kannel/ChangeLog
+++ b/app-mobilephone/kannel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-mobilephone/kannel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.20 2009/09/17 05:34:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/ChangeLog,v 1.21 2009/09/25 01:20:07 mrness Exp $
+
+*kannel-1.4.3-r1 (25 Sep 2009)
+
+  25 Sep 2009; Alin Năstac <mrness@gentoo.org> -kannel-1.4.3.ebuild,
+  +kannel-1.4.3-r1.ebuild, +files/kannel-1.4.3-autotools.patch,
+  -files/kannel-1.4.3-nolex.patch, +files/kannel-bearerbox.initd,
+  +files/kannel-smsbox.initd, +files/kannel-wapbox.initd:
+  Correct doc dependencies and split init script in 3:
+  kannel-{bearerbox,smsbox,wapbox} (#285246).
 
   17 Sep 2009; Alin Năstac <mrness@gentoo.org> kannel-1.4.3.ebuild:
   Install certificate in /etc/ssl and correct info messages (#285152).
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-nolex.patch b/app-mobilephone/kannel/files/kannel-1.4.3-autotools.patch
index 6562ba46e4de..e39cad8708c8 100644
--- a/app-mobilephone/kannel/files/kannel-1.4.3-nolex.patch
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-autotools.patch
@@ -1,6 +1,17 @@
 diff -Nru gateway-1.4.3.orig/configure.in gateway-1.4.3/configure.in
 --- gateway-1.4.3.orig/configure.in	2009-01-12 16:47:01.000000000 +0000
 +++ gateway-1.4.3/configure.in	2009-03-01 14:18:51.000000000 +0000
+@@ -95,8 +95,9 @@
+ AC_SUBST(PKGADD_VENDOR)
+ 
+ dnl Target installation directory for documentation
++PACKAGE=kannel
+ AC_SUBST(docdir)
+-docdir='${prefix}/share/doc/kannel'
++AC_SUBST(PACKAGE)
+ 
+ dnl Checks system type.
+ AC_CONFIG_SECTION([Running system checks])
 @@ -112,7 +112,6 @@
  AC_PROG_INSTALL
  AC_PROG_RANLIB
diff --git a/app-mobilephone/kannel/files/kannel-bearerbox.initd b/app-mobilephone/kannel/files/kannel-bearerbox.initd
new file mode 100644
index 000000000000..a573dbe5e21a
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-bearerbox.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/files/kannel-bearerbox.initd,v 1.1 2009/09/25 01:20:06 mrness Exp $
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need net
+	after dns mysql postgresql
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/files/kannel-smsbox.initd b/app-mobilephone/kannel/files/kannel-smsbox.initd
new file mode 100644
index 000000000000..ec0bd4076a2b
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-smsbox.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/files/kannel-smsbox.initd,v 1.1 2009/09/25 01:20:06 mrness Exp $
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need kannel-bearerbox
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/files/kannel-wapbox.initd b/app-mobilephone/kannel/files/kannel-wapbox.initd
new file mode 100644
index 000000000000..8bab2310c933
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-wapbox.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/files/kannel-wapbox.initd,v 1.1 2009/09/25 01:20:06 mrness Exp $
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need kannel-bearerbox
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/kannel-1.4.3.ebuild b/app-mobilephone/kannel/kannel-1.4.3-r1.ebuild
index 8dd550e8eadb..3cca3f35408f 100644
--- a/app-mobilephone/kannel/kannel-1.4.3.ebuild
+++ b/app-mobilephone/kannel/kannel-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.3.ebuild,v 1.3 2009/09/17 05:34:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kannel/kannel-1.4.3-r1.ebuild,v 1.1 2009/09/25 01:20:07 mrness Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=none
@@ -16,21 +16,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssl mysql sqlite postgres pcre doc debug pam"
 
+RESTRICT="test" # some tests fail with "address already in use"
+
 RDEPEND="sys-libs/e2fsprogs-libs
-	>=dev-libs/libxml2-2.6.26
-	>=dev-lang/perl-5.8.8
-	>=sys-libs/zlib-1.2.3
-	ssl? ( >=dev-libs/openssl-0.9.8d )
+	dev-libs/libxml2
+	dev-lang/perl
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl )
 	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.2.1 )
+	sqlite? ( dev-db/sqlite:3 )
 	postgres? ( virtual/postgresql-server )
 	pcre? ( dev-libs/libpcre )
-	doc? ( media-gfx/transfig
-		app-text/jadetex
-		app-text/docbook-dsssl-stylesheets )
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.2"
+	>=sys-devel/bison-2.2
+	doc? ( media-gfx/transfig
+		app-text/jadetex
+		app-text/docbook-dsssl-stylesheets
+		app-text/docbook-sgml-dtd:3.1 )"
 
 S="${WORKDIR}/gateway-${PV}"
 
@@ -41,7 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-custom-wap-ports.patch"
-	epatch "${FILESDIR}/${P}-nolex.patch" # flex is not used
+	epatch "${FILESDIR}/${P}-autotools.patch"
 	epatch "${FILESDIR}/${P}-external-libuuid.patch"
 
 	#by default, use current directory for logging
@@ -52,7 +55,7 @@ src_prepare() {
 
 src_configure() {
 	append-flags -fno-strict-aliasing # some code breaks strict aliasing
-	econf --docdir=/usr/share/doc/${P} \
+	econf --docdir=/usr/share/doc/${PF} \
 		--enable-localtime \
 		--disable-start-stop-daemon \
 		--without-sqlite2 \
@@ -67,9 +70,10 @@ src_configure() {
 		|| die "econf failed"
 }
 
-src_test() {
-	emake check || die "make check failed"
-}
+# phase disabled by RESTRICT
+# src_test() {
+# 	emake check || die "emake check failed"
+# }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
@@ -83,14 +87,14 @@ src_install() {
 	dodir /etc/kannel
 	insinto /etc/kannel
 	newins doc/examples/kannel.conf kannel.conf.sample
-	newins doc/examples/modems.conf modems.conf.sample
-	use mysql && newins doc/examples/dlr-mysql.conf dlr-mysql.conf.sample
 
-	diropts -g kannel -m0770
-	keepdir /var/log/kannel
+	local f
+	for f in bearerbox smsbox wapbox; do
+		newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
+	done
 
-	newinitd "${FILESDIR}/kannel-initd" kannel
-	newconfd "${FILESDIR}/kannel-confd" kannel
+	diropts -g kannel -m0770
+	keepdir /var/log/kannel /var/run/kannel
 }
 
 pkg_postinst() {