Updated sip-router series v3.1.x and v3.2.x

5 files changed, 28 insertions, 269 deletions

diff --git a/net-misc/sip-router/ChangeLog b/net-misc/sip-router/ChangeLog
index ff59e5c..7477b26 100644
--- a/net-misc/sip-router/ChangeLog
+++ b/net-misc/sip-router/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sip-router-3.2.4 (4 Oct 2012)
+
+  4 Oct 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.4.ebuild:
+  Version bump (series 3.2.x).
+
+*sip-router-3.1.6 (3 Oct 2012)
+
+  3 Oct 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.1.6.ebuild:
+  Version bump (series 3.1.x).
+
+
 *sip-router-3.2.3 (26 Apr 2012)
 
   26 Apr 2012; Claudio G. Furrer <elcaio@gmail.com> +sip-router.3.2.3.ebuild:
diff --git a/net-misc/sip-router/Manifest b/net-misc/sip-router/Manifest
index 2e949c7..81a1d4c 100644
--- a/net-misc/sip-router/Manifest
+++ b/net-misc/sip-router/Manifest
@@ -1,14 +1,12 @@
-AUX ser.confd 514 RMD160 1e27c35d6a7ed944cec2d5d579ee7a62b44af28a SHA1 7574cdb34034c84cf8c5f8eba323fbfbd5df2a4e SHA256 fec2d2b5c1f222bfd413ece424c2ee6b7fdff2fc71f8b95abb6b31118f209770
-AUX ser.initd 800 RMD160 22797e05ff7a13b4ee2d080b20f14abadd8198ec SHA1 8f66d7312b23f5965e83dc93d19fc04e6d5b5f45 SHA256 c9b748c5756e1bf2ee72ff0350b5f9ad1b8489d41008a00d66e335b276252a44
-DIST kamailio-3.1.4_src.tar.gz 6959507 RMD160 d0f8746be3bda86c650486ac3a31186778e79dc4 SHA1 d663936e542969b63671dd514e7b368448fbe404 SHA256 669564fe3be9c8439749f6d435d39b5851c7fff61392924e2e6aeb60a8793956
-DIST kamailio-3.1.5_src.tar.gz 7025269 RMD160 b118e29d91303e0d84f7ebdb7d0d8641ce6f204c SHA1 62d32ceeddf29e6f279951cd329dc314bbc2b9bc SHA256 5d1a2db3f9bea3cfac76777646627be24e6033876a5bf60200882be00cefe9ca
-DIST kamailio-3.2.1_src.tar.gz 7252354 RMD160 9985c8de51fde8be081ab1da288d46421d87aa48 SHA1 ed9d27642429e94ed82ac89cf4dec71ef3177920 SHA256 4705711e19106268e300df3a4029dd3b94b0e57352de2766cb9ceb8c05c80afd
-DIST kamailio-3.2.2_src.tar.gz 7220916 RMD160 8581e020e0c1a168c57268bd782f2e3badb6ac51 SHA1 118c4e1c05165da84b2f91865c23c5f81c403689 SHA256 823653fcf5edf27d01adc4af4af5d515b7ccaa95039bc3eb71c28474e75ce44e
-DIST kamailio-3.2.3_src.tar.gz 7227846 RMD160 94a4f5975e1d3b2c92297bd9135c9a0b5c76cb79 SHA1 790a8d4db0d75dafe178caf7bc8948aa81227f2b SHA256 673253bb3ec2f0cccba0fcddc8c93b3a41da4a1f63b5220736ee348d5ca3d131
-EBUILD sip-router-3.1.4.ebuild 8024 RMD160 604e7f73449afcd0659ad0b7628a41f95aca16bf SHA1 012566e917c412e90e2addec3d5f83f895e337c1 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78
-EBUILD sip-router-3.1.5.ebuild 8024 RMD160 604e7f73449afcd0659ad0b7628a41f95aca16bf SHA1 012566e917c412e90e2addec3d5f83f895e337c1 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78
-EBUILD sip-router-3.2.1.ebuild 8115 RMD160 7654b54c122b27eb7237598c983cc8c6eaf1e45b SHA1 6188216b0a553dd38113781bdb83f38b77651bcc SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f
-EBUILD sip-router-3.2.2.ebuild 8115 RMD160 7654b54c122b27eb7237598c983cc8c6eaf1e45b SHA1 6188216b0a553dd38113781bdb83f38b77651bcc SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f
-EBUILD sip-router-3.2.3.ebuild 8115 RMD160 7654b54c122b27eb7237598c983cc8c6eaf1e45b SHA1 6188216b0a553dd38113781bdb83f38b77651bcc SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f
-MISC ChangeLog 1913 RMD160 eee742d8e10f8b2fc95cd4102bd91d792e1fc204 SHA1 8284e767dd5125f925c8f5b93f6757bae69bd064 SHA256 2a9804f439513886317debad106207d8b4e1acfb93fd94ff941c09f2912b06b8
-MISC metadata.xml 234 RMD160 7e65eb5a9a08368288fc1e3608ddb9a4677defdd SHA1 93c38407f533f522647683eb7b7c2121bc6f3707 SHA256 4009ad9d312db0ece6fd53e9dfabda98e2c1037ec540eb64d6ab43fe318c1a25
+AUX ser.confd 514 SHA256 fec2d2b5c1f222bfd413ece424c2ee6b7fdff2fc71f8b95abb6b31118f209770 SHA512 3745b3bdc1ae2dd2d4cf7c4dbdcb5dc8a2667dcbb50bcff89ea01ac3f95ff213b93ae0402c45703305781fd9c6f4968f59f1a9c509670f54f4cf58a788d53c55 WHIRLPOOL 645a88d3442a34d755eed69a7586c96f219ea3fb096ba6a86aaf13314d306c59d9dd5a656787612b1c0a7e784f148d712641f3c2869383a542e11c9525cd881b
+AUX ser.initd 800 SHA256 c9b748c5756e1bf2ee72ff0350b5f9ad1b8489d41008a00d66e335b276252a44 SHA512 57f558a42cfeee7eb78583ba68d64874e3d162c67ec064034061cf37e47d42e2924f0a37ecc47c25d7df1cab9281ac0d0f06ccb3b1bdebde8894f4450b3a8696 WHIRLPOOL cb6a2ff4d7ae5c88d87f1341ab38c787454b7074c9780cf93ebf52a06623720413ae636f40027beff18d828669194b47c5395ac368036db5bf8b543f6fdef54f
+DIST kamailio-3.1.5_src.tar.gz 7025269 SHA256 5d1a2db3f9bea3cfac76777646627be24e6033876a5bf60200882be00cefe9ca SHA512 5090e656ea3af12ea9dbbb09d2b1fbfaca4b7089f695d3652a64802d1e763678c2b2a03796eebb1a5d47530a786a4b88e9e5ee5bf80c260f4bd75033be3008cf WHIRLPOOL 68538eb109a4c5f8ab75e58a06453d80a2c80fcb777b42042369a8ed730a59634aaec1cb84a8c9c1e17dbc2a940851a698beb63f9afa2420748d6694a61c5686
+DIST kamailio-3.1.6_src.tar.gz 7002535 SHA256 eb69af9d5bf851c802618ffe9f901200a750366fe9a68e0fc7e5ed233997f4b5 SHA512 66347f73e8b48cb746e950c57b726a3e7640ae7ec78575307fb250103cab5660c93b1e186bdd89589a62f0d3ea329ea659afdf21723fd0bb9d89a041231850ff WHIRLPOOL fe309ab3c317b534e920605f749654f37670cb86f19417461f56692a26b54a54857a8c62c2332e25c9a308924974227e2a815bbbcaf84498bd866a9888d48fc9
+DIST kamailio-3.2.3_src.tar.gz 7227846 SHA256 673253bb3ec2f0cccba0fcddc8c93b3a41da4a1f63b5220736ee348d5ca3d131 SHA512 59dae999b0a598156032ba86e29cabf2053de1e7cb6dcb4a3b0ad76e4f0acc18980c804185a8edb545a360247676be13cbab77f2465875bb9591ca3885e85368 WHIRLPOOL b7978bba572724d709744a6c4e61aef740c611e011ef20469b51f9a419e88776329e4936ac664b1bce2c2b4b0b861c17ac927935637d0795c124597a1f163b2c
+DIST kamailio-3.2.4_src.tar.gz 7253378 SHA256 f367de0957807479f6c3f1df6ad3033819504c99f6007b90bc73ff0535657ab7 SHA512 9fe97296ac4321f8c9c052011b66ba298951499b4c27d16cb3b3e8aa6b9619e7ef91679c5ce22f4b0639bb06ceedc859efd2df3199338fb5da73005f11926eac WHIRLPOOL bf020eaab1b1e339165e51628ec37de8cbf9defde92248a37b519689516ee200287638a2ec489a180c05633bd9d7ddd933793f50ca97f360ad3a8310599d1493
+EBUILD sip-router-3.1.5.ebuild 8024 SHA256 1adb67682eaa5a9dfee306473023bf7403068199a0e8916db521e230452b1e78 SHA512 8e8bf4b491e9dd5c17230fdd338138188f16a584e9a4e22baea4ac22a767ff8e40860618a630afd959f57fcf0948d7081827ddbcc1a6b62d691518d4716e6a2f WHIRLPOOL 820bbfcb11137d0a9414a9f9ebbb5be6930b269d1341c1b323ea682a55d1514312b918f7150b33034722c4d239f2f4b66a8edf41bec587f382ad24a140278088
+EBUILD sip-router-3.1.6.ebuild 8106 SHA256 a2959cdeef926236cdbadf06b4c2340ffca7cde1338499a14ca511c60ab3556a SHA512 ac238b7dd0a669a16caa047c99d74c0d0425759340b59785b1a3e593ae9e245d1e8dcf71b052070d8681c5b0db03abf2e7250b7f20fb09837d727809272f2515 WHIRLPOOL d3d332d549b9e73a6e685bbbe8e093372d794fd506e0826103450cc8a59bfa4c7f939d3893dab09ed845541c74ff64d8d04c3aad24ffea9b6964457806e7d387
+EBUILD sip-router-3.2.3.ebuild 8115 SHA256 fa4b3c79a93ee13bfa8ed47952c549e848b452689d78fac8d8596b4e2966864f SHA512 e257ecf83f44f446098ec6fc7b0565e5ca6b7eb7dbeddc34baacb5592825065ef93a05ca24c3f85b6c817e4c23e407861e7c1bc79d883f4882f7153a88bbc928 WHIRLPOOL 0a44d52e6fbae7e79f2f69b115734174af30cd6b662205e81b84b92b92158e7fb94416fa4d35b5b3c0f6048f6ca7b269c46c860602a276c872b5605cd1b018f0
+EBUILD sip-router-3.2.4.ebuild 8155 SHA256 4efbbf1cea7d46f065947869723db90dc43453b6451b6830dcf5f5363a3ff5b8 SHA512 2c20dfdee22e54f8a429e4aedcc7c0771c2e03b53a7632a11fdc47335d81ed33fc89070d22775c7cba68f7874fec97ac8441338b44f62be30654092ac0f239af WHIRLPOOL 53a960bc2d8bbd3a1a0a4fc3eee5ded932fd2576b57f12e1030a58913aeab2b61e089a23849c5b65afb41abd299cb7aa9496db343a6f472fc5438de27ef7f67c
+MISC ChangeLog 2196 SHA256 d90c6a386be780c0be3608d547eae96817a285101c96448745e04fcbfc1cd1b1 SHA512 a97f0f0e2d297913ed7ce916fde2be5bee149f49044bdf875d5165484f3d1dd05817a6168a5e919bee67d3bce3b29b92b5edf1ea47bb12b224d499d2f03ceaad WHIRLPOOL a3daba64fc8e6810c7ec673005b30cf2a0b39fab4b7017c9e846ef7bcd787dd17baa23843c8c891cfb761b88f9fa2562ee5bf258d2207f995870f1557efdaff2
+MISC metadata.xml 234 SHA256 4009ad9d312db0ece6fd53e9dfabda98e2c1037ec540eb64d6ab43fe318c1a25 SHA512 cca7444682a294c6173682dc78d73ee82ff19a6a8bc052d6850dab0a49056c0bcca347b83cd592360540399f21016fc360ea29a2234dd8fa1d6e13f6feedee16 WHIRLPOOL a37bbdac2e9489e68e1e0871eb8847dd04df20c4aae756173e7c6a13622ee60c87508f6f26e24b1dbe9c5cb929f57cb86c65042945d8129d3ba1ef8d7338b314
diff --git a/net-misc/sip-router/sip-router-3.1.4.ebuild b/net-misc/sip-router/sip-router-3.1.6.ebuild
index cd0f9a8..8635ecc 100644
--- a/net-misc/sip-router/sip-router-3.1.4.ebuild
+++ b/net-misc/sip-router/sip-router-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -47,6 +47,7 @@ xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp"
 RDEPEND="
 	>=sys-libs/ncurses-5.7
 	>=sys-libs/readline-6.1_p2
+	group_experimental? ( dev-libs/openssl dev-db/oracle-instantclient-basic )
 	group_mysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
 	group_radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	group_presence? ( dev-libs/libxml2 net-misc/curl )
@@ -61,7 +62,7 @@ RDEPEND="
 	group_kperl? ( dev-lang/perl dev-perl/perl-ldap )
 	group_kldap? ( net-nds/openldap )
 	acc_radius? ( net-dialup/radiusclient-ng )
-	app_lua? ( dev-lang/lua )
+	app_lua? ( >=dev-lang/lua-5.1 )
 	app_python? ( dev-lang/python )
 	auth_identity? ( dev-libs/openssl net-misc/curl )
 	carrierroute? ( dev-libs/confuse )
diff --git a/net-misc/sip-router/sip-router-3.2.2.ebuild b/net-misc/sip-router/sip-router-3.2.2.ebuild
deleted file mode 100644
index 6b00f62..0000000
--- a/net-misc/sip-router/sip-router-3.2.2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Sip-Router (Kamailio/SER) is an Open Source SIP Server"
-HOMEPAGE="http://sip-router.org/"
-MY_P="${P/sip-router/kamailio}"
-SRC_URI="http://www.kamailio.org/pub/kamailio/${PV}/src/${MY_P}_src.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-#Documentation can be found here: http://www.kamailio.org/docs/modules/3.2.x/
-IUSE="flavour_kamailio flavour_ser debug ipv6 sctp
-group_standard group_standard_dep group_mysql group_radius group_postgres group_presence group_stable group_experimental
-group_kstandard group_kmysql group_kradius group_kpostgres group_kpresence
-group_kxml group_kperl group_kldap group_kjson
-acc acc_radius alias_db app_lua app_python async auth auth_identity auth_db auth_diameter auth_radius avpops
-benchmark blst
-call_control carrierroute cfg_db cfg_rpc cfgutils counters cpl-c ctl
-db_berkeley db_flatstore db_mysql db_oracle db_postgres db_text db_unixodbc
-db_sqlite ndb_redis
-debugger dialog dialplan dispatcher diversion domain domainpolicy drouting dmq
-enum exec geoip group
-h350 htable imc ipops iptrtpproxy jabber json jsonrpc-c kex
-lcr ldap
-matrix maxfwd mediaproxy memcached misc_radius mi_datagram mi_fifo mi_rpc mi_xmlrpc mqueue msilo mtree
-nathelper nat_traversal
-osp
-p_usrloc
-path pdb pdt peering perl perlvdb permissions pike pipelimit prefix_route
-presence presence_conference presence_dialoginfo presence_mwi presence_reginfo presence_xml
-pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp purple pv
-qos
-ratelimit regex registrar rls rtimer rr rtpproxy
-sanity sdpops seas sipcapture siptrace siputils sl sms snmpstats speeddial sqlops statistics sst
-textops textopsx tls tm tmx topoh
-uac uac_redirect uri_db userblacklist usrloc utils
-xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp"
-
-#pdb? ( pdb-server )
-#seas? ( www.wesip.eu )
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7
-	>=sys-libs/readline-6.1_p2
-	group_experimental? ( dev-libs/openssl dev-db/redis )
-	group_mysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
-	group_radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
-	group_presence? ( dev-libs/libxml2 net-misc/curl )
-	group_postgres? ( dev-db/postgresql-base )
-	group_standard? ( dev-libs/libxml2 dev-libs/openssl net-misc/curl )
-	group_kmysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
-	group_kradius? ( >=net-dialup/radiusclient-ng-0.5.0 )
-	group_kpresence? ( dev-libs/libxml2 net-misc/curl )
-	group_kpostgres? ( dev-db/postgresql-base )
-	group_kstandard? ( dev-libs/libxml2 dev-libs/openssl net-misc/curl )
-	group_kxml? ( dev-libs/libxml2 dev-libs/xmlrpc-c )
-	group_kperl? ( dev-lang/perl dev-perl/perl-ldap )
-	group_kldap? ( net-nds/openldap )
-	group_kjson? ( dev-libs/json-c dev-libs/libevent )
-	acc_radius? ( net-dialup/radiusclient-ng )
-	app_lua? ( dev-lang/lua )
-	app_python? ( dev-lang/python )
-	auth_identity? ( dev-libs/openssl net-misc/curl )
-	carrierroute? ( dev-libs/confuse )
-	cpl-c? ( dev-libs/libxml2 )
-	db_berkeley? ( >=sys-libs/db-4.6 )
-	db_mysql? ( >=dev-db/mysql-5.1.50 )
-	db_oracle? ( dev-db/oracle-instantclient-basic )
-	db_postgres? ( dev-db/postgresql-base )
-	db_sqlite? ( >=dev-db/sqlite-3 )
-	db_unixodbc? ( dev-db/unixODBC )
-	ndb_redis? ( dev-db/redis )
-	dialplan? ( dev-libs/libpcre )
-	geoip? ( dev-libs/geoip )
-	h350? ( net-nds/openldap )
-	jabber? ( dev-libs/expat )
-	lcr? ( dev-libs/libpcre )
-	ldap? ( net-nds/openldap )
-	memcached? ( dev-libs/libmemcache net-misc/memcached )
-	mi_xmlrpc? ( dev-libs/libxml2 dev-libs/xmlrpc-c )
-	osp? ( net-libs/osptoolkit )
-	peering? ( net-dialup/radiusclient-ng )
-	perl? ( dev-lang/perl dev-perl/perl-ldap )
-	presence? ( dev-libs/libxml2 )
-	presence_conference? ( dev-libs/libxml2 )
-	presence_xml? ( dev-libs/libxml2 )
-	pua? ( dev-libs/libxml2 )
-	pua_bla? ( dev-libs/libxml2 )
-	pua_dialoginfo? ( dev-libs/libxml2 )
-	pua_usrloc? ( dev-libs/libxml2 )
-	pua_xmpp? ( dev-libs/libxml2 )
-	purple? ( net-im/pidgin )
-	regex? ( dev-libs/libpcre )
-	rls? ( dev-libs/libxml2 )
-	snmpstats? ( net-analyzer/net-snmp sys-apps/lm_sensors )
-	tls? (
-		sys-libs/zlib
-		>=dev-libs/openssl-1.0.0a-r1
-	)
-	utils? ( net-misc/curl )
-	xcap_client? ( dev-libs/libxml2 net-misc/curl )
-	xcap_server? ( dev-libs/libxml2 )
-	xmlops? ( dev-libs/libxml2 )
-	xmpp? ( dev-libs/expat )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.35
-	>=sys-devel/flex-2.5.4a
-	app-text/docbook2X"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ipv6 || \
-		sed -i -e "s/-DUSE_IPV6//g" Makefile.defs || die
-}
-
-src_compile() {
-	# iptrtpproxy broken as the needed netfilter module is not supported
-	local mod_exc="iptrtpproxy"
-	local group_inc=""
-	local k=""
-	if use flavour_kamailio; then
-		k="k"
-		use group_kxml && group_inc="${group_inc} kxml"
-		use group_kperl && group_inc="${group_inc} kperl"
-		use group_kldap && group_inc="${group_inc} kldap"
-		use group_kjson && group_inc="${group_inc} kjson"
-	fi
-	# you can USE flavour=kamailio but also group_standard. It will be converted to group_kstandard
-	# same as mysql/kmysql, postgres/kpostgres, radius/kradius, presence/kpresence
-	(use group_standard || use group_kstandard) && group_inc="${group_inc} ${k}standard"
-	use group_standard_dep && group_inc="${group_inc} standard_dep"
-	(use group_mysql || use group_kmysql) && group_inc="${group_inc} ${k}mysql"
-	(use group_radius || use group_kradius) && group_inc="${group_inc} ${k}radius"
-	(use group_postgres || use group_kpostgres) && group_inc="${group_inc} ${k}postgres"
-	(use group_presence || use group_kpresence) && group_inc="${group_inc} ${k}presence"
-	use group_stable && group_inc="${group_inc} stable"
-	use group_experimental && group_inc="${group_inc} experimental"
-	# TODO: skip_modules?
-
-	local mod_inc=""
-	# some IUSE flags must not be included here in mod_inc
-	# e.g.: flavour_kamailio, flavour_ser, debug, sctp, ipv6
-	for i in ${IUSE[@]}; do
-		for j in ${i[@]}; do
-			[[ ! "${i}" =~ "flavour_" ]] && \
-				[ ! "${i}" == "debug" ] && \
-				[ ! "${i}" == "ipv6" ] && \
-				[ ! "${i}" == "sctp" ] && \
-				[[ ! "${i}" =~ "group_" ]] && \
-			use "${i}" && mod_inc="${mod_inc} ${i}"
-		done
-	done
-
-	if use tls; then
-		tls_hooks=1
-	else
-		tls_hooks=0
-	fi
-
-	if use debug; then
-		mode=debug
-	else
-		mode=release
-	fi
-
-	if use flavour_kamailio; then
-		flavour=kamailio
-	else
-		flavour=ser # defaults to SER compatibility names
-	fi
-
-	if use sctp; then
-		sctp=1
-	else
-		sctp=0
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		CPU_TYPE="$(get-flag march)" \
-		SCTP="${sctp}" \
-		CC_EXTRA_OPTS=-I/usr/gnu/include \
-		mode="${mode}" \
-		TLS_HOOKS="${tls_hooks}" \
-		FLAVOUR="${flavour}" \
-		group_include="${group_inc}" \
-		include_modules="${mod_inc}" \
-		exclude_modules="${mod_exc}" \
-		prefix="/" \
-		all || die "emake all failed"
-}
-
-src_install() {
-	emake -j1 \
-		BASEDIR="${D}" \
-		FLAVOUR="${flavour}" \
-		prefix="/" \
-		bin_dir=/usr/sbin/ \
-		cfg_dir=/etc/${flavour}/ \
-		lib_dir=/usr/$(get_libdir)/${flavour}/ \
-		modules_dir="/usr/$(get_libdir)/${flavour}/" \
-		man_dir="/usr/share/man/" \
-		doc_dir="/usr/share/doc/${flavour}/" \
-		share_dir="/usr/share/${flavour}/" \
-		data_dir="/usr/share/${flavour}/" \
-		install || die "emake install failed"
-
-	sed -e "s/sip-router/${flavour}/g" \
-		${FILESDIR}/ser.initd > ${flavour}.initd || die
-	sed -e "s/sip-router/${flavour}/g" \
-		${FILESDIR}/ser.confd > ${flavour}.confd || die
-
-	newinitd "${flavour}".initd "${flavour}"
-	newconfd "${flavour}".confd "${flavour}"
-}
-
-pkg_preinst() {
-	if [[ -z "$(egetent passwd ${flavour})" ]]; then
-		einfo "Adding ${flavour} user and group"
-		enewgroup "${flavour}"
-		enewuser  "${flavour}" -1 -1 /dev/null "${flavour}"
-	fi
-
-	chown -R root:"${flavour}"  "${D}/etc/${flavour}"
-	chmod -R u=rwX,g=rX,o= "${D}/etc/${flavour}"
-
-}
-
-pkg_postinst() {
-	if [ use mediaproxy ]; then
-		einfo "You have enabled mediaproxy support. In order to use it, you have
-		to run it somewhere."
-	fi
-	if [ use rtpproxy ]; then
-		einfo "You have enabled rtpproxy support. In order to use it, you have
-		to run it somewhere."
-	fi
-}
-
-pkg_prerm () {
-	/etc/init.d/"${flavour}" stop >/dev/null
-}
diff --git a/net-misc/sip-router/sip-router-3.2.1.ebuild b/net-misc/sip-router/sip-router-3.2.4.ebuild
index 6b00f62..9eae9c6 100644
--- a/net-misc/sip-router/sip-router-3.2.1.ebuild
+++ b/net-misc/sip-router/sip-router-3.2.4.ebuild
@@ -48,7 +48,7 @@ xcap_client xcap_server xhttp xlog xmlops xmlrpc xmpp"
 RDEPEND="
 	>=sys-libs/ncurses-5.7
 	>=sys-libs/readline-6.1_p2
-	group_experimental? ( dev-libs/openssl dev-db/redis )
+	group_experimental? ( dev-libs/openssl dev-db/redis dev-db/oracle-instantclient-basic )
 	group_mysql? ( >=dev-db/mysql-5.1.50 sys-libs/zlib )
 	group_radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	group_presence? ( dev-libs/libxml2 net-misc/curl )
@@ -64,7 +64,7 @@ RDEPEND="
 	group_kldap? ( net-nds/openldap )
 	group_kjson? ( dev-libs/json-c dev-libs/libevent )
 	acc_radius? ( net-dialup/radiusclient-ng )
-	app_lua? ( dev-lang/lua )
+	app_lua? ( >=dev-lang/lua-5.1 )
 	app_python? ( dev-lang/python )
 	auth_identity? ( dev-libs/openssl net-misc/curl )
 	carrierroute? ( dev-libs/confuse )